From: Olga Kornievskaia <kolga@netapp.com>
Date: Tue, 2 Jul 2019 19:11:48 +0000 (-0400)
Subject: NFS: replace cross device check in copy_file_range
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8dff1df551dffc29fa78771c8dda2f0b094003aa;p=linux.git

NFS: replace cross device check in copy_file_range

Add a check to disallow cross file systems copy offload, both
files are expected to be of NFS4.2+ type.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
---

diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index 8978325649231..e97813b15e23e 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -141,7 +141,7 @@ static ssize_t __nfs4_copy_file_range(struct file *file_in, loff_t pos_in,
 	bool sync = false;
 
 	/* Only offload copy if superblock is the same */
-	if (file_inode(file_in)->i_sb != file_inode(file_out)->i_sb)
+	if (file_in->f_op != &nfs4_file_operations)
 		return -EXDEV;
 	if (!nfs_server_capable(file_inode(file_out), NFS_CAP_COPY))
 		return -EOPNOTSUPP;