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

Commit eab26ad1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xfs fixes from Darrick Wong:

 - fix a race between overlapping copy on write aio

 - fix cow fork swapping when we defragment reflinked files

* tag 'xfs-4.14-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: handle racy AIO in xfs_reflink_end_cow
  xfs: always swap the cow forks when swapping extents
parents 17d084c8 e12199f8

fs/xfs/xfs_bmap_util.c

+22 −2
Original line number Original line Diff line number Diff line
@@ -2122,11 +2122,31 @@ xfs_swap_extents( 
		ip->i_d.di_flags2 |= tip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK;

		ip->i_d.di_flags2 |= tip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK;

		tip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK;

		tip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK;

		tip->i_d.di_flags2 |= f & XFS_DIFLAG2_REFLINK;

		tip->i_d.di_flags2 |= f & XFS_DIFLAG2_REFLINK;

	}



	/* Swap the cow forks. */

	if (xfs_sb_version_hasreflink(&mp->m_sb)) {

		xfs_extnum_t	extnum;



		ASSERT(ip->i_cformat == XFS_DINODE_FMT_EXTENTS);

		ASSERT(tip->i_cformat == XFS_DINODE_FMT_EXTENTS);



		extnum = ip->i_cnextents;

		ip->i_cnextents = tip->i_cnextents;

		tip->i_cnextents = extnum;



		cowfp = ip->i_cowfp;

		cowfp = ip->i_cowfp;

		ip->i_cowfp = tip->i_cowfp;

		ip->i_cowfp = tip->i_cowfp;

		tip->i_cowfp = cowfp;

		tip->i_cowfp = cowfp;



		if (ip->i_cowfp && ip->i_cnextents)

			xfs_inode_set_cowblocks_tag(ip);

			xfs_inode_set_cowblocks_tag(ip);

		else

			xfs_inode_clear_cowblocks_tag(ip);

		if (tip->i_cowfp && tip->i_cnextents)

			xfs_inode_set_cowblocks_tag(tip);

			xfs_inode_set_cowblocks_tag(tip);

		else

			xfs_inode_clear_cowblocks_tag(tip);

	}

	}





	xfs_trans_log_inode(tp, ip,  src_log_flags);

	xfs_trans_log_inode(tp, ip,  src_log_flags);

fs/xfs/xfs_reflink.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -736,7 +736,13 @@ xfs_reflink_end_cow( 
	/* If there is a hole at end_fsb - 1 go to the previous extent */

	/* If there is a hole at end_fsb - 1 go to the previous extent */

	if (!xfs_iext_lookup_extent(ip, ifp, end_fsb - 1, &idx, &got) ||

	if (!xfs_iext_lookup_extent(ip, ifp, end_fsb - 1, &idx, &got) ||

	    got.br_startoff > end_fsb) {

	    got.br_startoff > end_fsb) {

		ASSERT(idx > 0);

		/*

		 * In case of racing, overlapping AIO writes no COW extents

		 * might be left by the time I/O completes for the loser of

		 * the race.  In that case we are done.

		 */

		if (idx <= 0)

			goto out_cancel;

		xfs_iext_get_extent(ifp, --idx, &got);

		xfs_iext_get_extent(ifp, --idx, &got);

	}

	}
@@ -809,6 +815,7 @@ xfs_reflink_end_cow( 




out_defer:

out_defer:

	xfs_defer_cancel(&dfops);

	xfs_defer_cancel(&dfops);

out_cancel:

	xfs_trans_cancel(tp);

	xfs_trans_cancel(tp);

	xfs_iunlock(ip, XFS_ILOCK_EXCL);

	xfs_iunlock(ip, XFS_ILOCK_EXCL);

out:

out: