This is a note to let you know that I've just added the patch titled xfs: evict CoW fork extents when performing finsert/fcollapse to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: xfs-evict-cow-fork-extents-when-performing-finsert-fcollapse.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 3af423b03435c81036fa710623d3ae92fbe346a3 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" <darrick.wong@xxxxxxxxxx> Date: Mon, 18 Sep 2017 09:41:17 -0700 Subject: xfs: evict CoW fork extents when performing finsert/fcollapse From: Darrick J. Wong <darrick.wong@xxxxxxxxxx> commit 3af423b03435c81036fa710623d3ae92fbe346a3 upstream. When we perform an finsert/fcollapse operation, cancel all the CoW extents for the affected file offset range so that they don't end up pointing to the wrong blocks. Reported-by: Amir Goldstein <amir73il@xxxxxxxxx> Reviewed-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx> Reviewed-by: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/xfs/xfs_bmap_util.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -1445,7 +1445,19 @@ xfs_shift_file_space( return error; /* - * The extent shiting code works on extent granularity. So, if + * Clean out anything hanging around in the cow fork now that + * we've flushed all the dirty data out to disk to avoid having + * CoW extents at the wrong offsets. + */ + if (xfs_is_reflink_inode(ip)) { + error = xfs_reflink_cancel_cow_range(ip, offset, NULLFILEOFF, + true); + if (error) + return error; + } + + /* + * The extent shifting code works on extent granularity. So, if * stop_fsb is not the starting block of extent, we need to split * the extent at stop_fsb. */ Patches currently in stable-queue which might be from darrick.wong@xxxxxxxxxx are queue-4.9/xfs-don-t-unconditionally-clear-the-reflink-flag-on-zero-block-files.patch queue-4.9/xfs-cancel-dirty-pages-on-invalidation.patch queue-4.9/xfs-reinit-btree-pointer-on-attr-tree-inactivation-walk.patch queue-4.9/xfs-report-zeroed-or-not-correctly-in-xfs_zero_range.patch queue-4.9/xfs-move-more-rt-specific-code-under-config_xfs_rt.patch queue-4.9/xfs-don-t-change-inode-mode-if-acl-update-fails.patch queue-4.9/xfs-handle-error-if-xfs_btree_get_bufs-fails.patch queue-4.9/xfs-update-i_size-after-unwritten-conversion-in-dio-completion.patch queue-4.9/xfs-trim-writepage-mapping-to-within-eof.patch queue-4.9/xfs-handle-racy-aio-in-xfs_reflink_end_cow.patch queue-4.9/xfs-evict-cow-fork-extents-when-performing-finsert-fcollapse.patch queue-4.9/xfs-capture-state-of-the-right-inode-in-xfs_iflush_done.patch queue-4.9/fs-xfs-use-ps-printk-format-for-direct-addresses.patch queue-4.9/xfs-perag-initialization-should-only-touch-m_ag_max_usable-for-ag-0.patch queue-4.9/xfs-always-swap-the-cow-forks-when-swapping-extents.patch queue-4.9/xfs-don-t-log-uninitialised-fields-in-inode-structures.patch