[v2,1/1] NFSv4.1 fix incorrect return value in copy_file_range
diff mbox series

Message ID 20190411183418.4510-1-olga.kornievskaia@gmail.com
State New
Headers show
Series
  • [v2,1/1] NFSv4.1 fix incorrect return value in copy_file_range
Related show

Commit Message

Olga Kornievskaia April 11, 2019, 6:34 p.m. UTC
From: Olga Kornievskaia <kolga@netapp.com>

According to the NFSv4.2 spec if the input and output file is the
same file, operation should fail with EINVAL. However, linux
copy_file_range() system call has no such restrictions. Therefore,
in such case let's return EOPNOTSUPP and allow VFS to fallback
to doing do_splice_direct(). Also when copy_file_range is called
on an NFSv4.0 or 4.1 mount (ie., a server that doesn't support
COPY functionality), we also need to return EOPNOTSUPP and
fallback to a regular copy.

Fixes xfstest generic/075, generic/091, generic/112, generic/263
for all NFSv4.x versions.

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
---
 fs/nfs/nfs42proc.c | 3 ---
 fs/nfs/nfs4file.c  | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

Comments

Trond Myklebust April 11, 2019, 6:44 p.m. UTC | #1
On Thu, 2019-04-11 at 14:34 -0400, Olga Kornievskaia wrote:
> From: Olga Kornievskaia <kolga@netapp.com>
> 
> According to the NFSv4.2 spec if the input and output file is the
> same file, operation should fail with EINVAL. However, linux
> copy_file_range() system call has no such restrictions. Therefore,
> in such case let's return EOPNOTSUPP and allow VFS to fallback
> to doing do_splice_direct(). Also when copy_file_range is called
> on an NFSv4.0 or 4.1 mount (ie., a server that doesn't support
> COPY functionality), we also need to return EOPNOTSUPP and
> fallback to a regular copy.
> 
> Fixes xfstest generic/075, generic/091, generic/112, generic/263
> for all NFSv4.x versions.
> 
> Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
> ---
>  fs/nfs/nfs42proc.c | 3 ---
>  fs/nfs/nfs4file.c  | 4 +++-
>  2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
> index ff6f85f..5196bfa 100644
> --- a/fs/nfs/nfs42proc.c
> +++ b/fs/nfs/nfs42proc.c
> @@ -329,9 +329,6 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t
> pos_src,
>  	};
>  	ssize_t err, err2;
>  
> -	if (!nfs_server_capable(file_inode(dst), NFS_CAP_COPY))
> -		return -EOPNOTSUPP;
> -
>  	src_lock = nfs_get_lock_context(nfs_file_open_context(src));
>  	if (IS_ERR(src_lock))
>  		return PTR_ERR(src_lock);
> diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
> index 45b2322..00d1719 100644
> --- a/fs/nfs/nfs4file.c
> +++ b/fs/nfs/nfs4file.c
> @@ -133,8 +133,10 @@ static ssize_t nfs4_copy_file_range(struct file
> *file_in, loff_t pos_in,
>  				    struct file *file_out, loff_t
> pos_out,
>  				    size_t count, unsigned int flags)
>  {
> +	if (!nfs_server_capable(file_inode(file_out), NFS_CAP_COPY))
> +		return -EOPNOTSUPP;
>  	if (file_inode(file_in) == file_inode(file_out))
> -		return -EINVAL;
> +		return -EOPNOTSUPP;
>  	return nfs42_proc_copy(file_in, pos_in, file_out, pos_out,
> count);
>  }
> 
That looks good. Thanks Olga!

Patch
diff mbox series

diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index ff6f85f..5196bfa 100644
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -329,9 +329,6 @@  ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
 	};
 	ssize_t err, err2;
 
-	if (!nfs_server_capable(file_inode(dst), NFS_CAP_COPY))
-		return -EOPNOTSUPP;
-
 	src_lock = nfs_get_lock_context(nfs_file_open_context(src));
 	if (IS_ERR(src_lock))
 		return PTR_ERR(src_lock);
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index 45b2322..00d1719 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -133,8 +133,10 @@  static ssize_t nfs4_copy_file_range(struct file *file_in, loff_t pos_in,
 				    struct file *file_out, loff_t pos_out,
 				    size_t count, unsigned int flags)
 {
+	if (!nfs_server_capable(file_inode(file_out), NFS_CAP_COPY))
+		return -EOPNOTSUPP;
 	if (file_inode(file_in) == file_inode(file_out))
-		return -EINVAL;
+		return -EOPNOTSUPP;
 	return nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count);
 }