diff mbox

fs: return -EOPNOTSUPP if clone is not supported

Message ID 1456509192-5608-2-git-send-email-hch@lst.de (mailing list archive)
State New, archived
Headers show

Commit Message

Christoph Hellwig Feb. 26, 2016, 5:53 p.m. UTC
-EBADF is a rather confusing error if an operations is not supported,
and nfsd gets rather upset about it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/read_write.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Darrick J. Wong Feb. 26, 2016, 9:51 p.m. UTC | #1
On Fri, Feb 26, 2016 at 06:53:12PM +0100, Christoph Hellwig wrote:
> -EBADF is a rather confusing error if an operations is not supported,
> and nfsd gets rather upset about it.

I was wondering why I kept getting EBADF trying to run xfstests over NFS
before I figured out to pass -o nfsvers=4.2 to mount.

Anyhow,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  fs/read_write.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/read_write.c b/fs/read_write.c
> index 324ec27..1cdfdfe 100644
> --- a/fs/read_write.c
> +++ b/fs/read_write.c
> @@ -1532,10 +1532,12 @@ int vfs_clone_file_range(struct file *file_in, loff_t pos_in,
>  
>  	if (!(file_in->f_mode & FMODE_READ) ||
>  	    !(file_out->f_mode & FMODE_WRITE) ||
> -	    (file_out->f_flags & O_APPEND) ||
> -	    !file_in->f_op->clone_file_range)
> +	    (file_out->f_flags & O_APPEND))
>  		return -EBADF;
>  
> +	if (!file_in->f_op->clone_file_range)
> +		return -EOPNOTSUPP;
> +
>  	ret = clone_verify_area(file_in, pos_in, len, false);
>  	if (ret)
>  		return ret;
> -- 
> 2.1.4
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/read_write.c b/fs/read_write.c
index 324ec27..1cdfdfe 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1532,10 +1532,12 @@  int vfs_clone_file_range(struct file *file_in, loff_t pos_in,
 
 	if (!(file_in->f_mode & FMODE_READ) ||
 	    !(file_out->f_mode & FMODE_WRITE) ||
-	    (file_out->f_flags & O_APPEND) ||
-	    !file_in->f_op->clone_file_range)
+	    (file_out->f_flags & O_APPEND))
 		return -EBADF;
 
+	if (!file_in->f_op->clone_file_range)
+		return -EOPNOTSUPP;
+
 	ret = clone_verify_area(file_in, pos_in, len, false);
 	if (ret)
 		return ret;