Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1742c0f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-4.13-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs fixes from Darrick Wong:
 "I have a couple more bug fixes for you today:

   - fix memory leak when issuing discard

   - fix propagation of the dax inode flag"

* tag 'xfs-4.13-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: Fix per-inode DAX flag inheritance
  xfs: Fix leak of discard bio
parents aae4e7a8 56bdf855

fs/xfs/xfs_inode.c

+7 −5
Original line number Diff line number Diff line
@@ -874,7 +874,6 @@ xfs_ialloc( 
	case S_IFREG:

	case S_IFDIR:

		if (pip && (pip->i_d.di_flags & XFS_DIFLAG_ANY)) {

			uint64_t	di_flags2 = 0;

			uint		di_flags = 0;



			if (S_ISDIR(mode)) {
@@ -911,20 +910,23 @@ xfs_ialloc( 
				di_flags |= XFS_DIFLAG_NODEFRAG;

			if (pip->i_d.di_flags & XFS_DIFLAG_FILESTREAM)

				di_flags |= XFS_DIFLAG_FILESTREAM;

			if (pip->i_d.di_flags2 & XFS_DIFLAG2_DAX)

				di_flags2 |= XFS_DIFLAG2_DAX;



			ip->i_d.di_flags |= di_flags;

			ip->i_d.di_flags2 |= di_flags2;

		}

		if (pip &&

		    (pip->i_d.di_flags2 & XFS_DIFLAG2_ANY) &&

		    pip->i_d.di_version == 3 &&

		    ip->i_d.di_version == 3) {

			uint64_t	di_flags2 = 0;



			if (pip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) {

				ip->i_d.di_flags2 |= XFS_DIFLAG2_COWEXTSIZE;

				di_flags2 |= XFS_DIFLAG2_COWEXTSIZE;

				ip->i_d.di_cowextsize = pip->i_d.di_cowextsize;

			}

			if (pip->i_d.di_flags2 & XFS_DIFLAG2_DAX)

				di_flags2 |= XFS_DIFLAG2_DAX;



			ip->i_d.di_flags2 |= di_flags2;

		}

		/* FALLTHROUGH */

	case S_IFLNK:

fs/xfs/xfs_log_cil.c

+1 −0
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ xlog_discard_endio( 


	INIT_WORK(&ctx->discard_endio_work, xlog_discard_endio_work);

	queue_work(xfs_discard_wq, &ctx->discard_endio_work);

	bio_put(bio);

}



static void