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

Commit 2387ff2f authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Greg Kroah-Hartman
Browse files

NFSv42: Fix pagecache invalidation after COPY/CLONE 



commit 3f015d89a47cd8855cd92f71fff770095bd885a1 upstream.

The mechanism in use to allow the client to see the results of COPY/CLONE
is to drop those pages from the pagecache.  This forces the client to read
those pages once more from the server.  However, truncate_pagecache_range()
zeros out partial pages instead of dropping them.  Let us instead use
invalidate_inode_pages2_range() with full-page offsets to ensure the client
properly sees the results of COPY/CLONE operations.

Cc: <stable@vger.kernel.org> # v4.7+
Fixes: 2e72448b ("NFS: Add COPY nfs operation")
Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c537846f

fs/nfs/nfs42proc.c

+3 −2
Original line number Diff line number Diff line
@@ -186,8 +186,9 @@ static ssize_t _nfs42_proc_copy(struct file *src, 
		goto out;

	}



	truncate_pagecache_range(dst_inode, pos_dst,

				 pos_dst + res->write_res.count);

	WARN_ON_ONCE(invalidate_inode_pages2_range(dst_inode->i_mapping,

					pos_dst >> PAGE_SHIFT,

					(pos_dst + res->write_res.count - 1) >> PAGE_SHIFT));



	status = res->write_res.count;

out: