Merge tag 'mac80211-for-net-2020-02-14' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / nfs / nfs42proc.c

diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index 1fe83e0f663e29f8c052f28ac2f330fd7197dcf1..e2ae54b35dfe1ff5da1bd1d656327b7b245e2cda 100644 (file)
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -61,8 +61,11 @@ static int _nfs42_proc_fallocate(struct rpc_message *msg, struct file *filep,
 
        status = nfs4_set_rw_stateid(&args.falloc_stateid, lock->open_context,
                        lock, FMODE_WRITE);
-       if (status)
+       if (status) {
+               if (status == -EAGAIN)
+                       status = -NFS4ERR_BAD_STATEID;
                return status;
+       }
 
        res.falloc_fattr = nfs_alloc_fattr();
        if (!res.falloc_fattr)
@@ -287,8 +290,11 @@ static ssize_t _nfs42_proc_copy(struct file *src,
        } else {
                status = nfs4_set_rw_stateid(&args->src_stateid,
                                src_lock->open_context, src_lock, FMODE_READ);
-               if (status)
+               if (status) {
+                       if (status == -EAGAIN)
+                               status = -NFS4ERR_BAD_STATEID;
                        return status;
+               }
        }
        status = nfs_filemap_write_and_wait_range(file_inode(src)->i_mapping,
                        pos_src, pos_src + (loff_t)count - 1);
@@ -297,8 +303,11 @@ static ssize_t _nfs42_proc_copy(struct file *src,
 
        status = nfs4_set_rw_stateid(&args->dst_stateid, dst_lock->open_context,
                                     dst_lock, FMODE_WRITE);
-       if (status)
+       if (status) {
+               if (status == -EAGAIN)
+                       status = -NFS4ERR_BAD_STATEID;
                return status;
+       }
 
        status = nfs_sync_inode(dst_inode);
        if (status)
@@ -334,14 +343,14 @@ static ssize_t _nfs42_proc_copy(struct file *src,
                status = handle_async_copy(res, dst_server, src_server, src,
                                dst, &args->src_stateid, restart);
                if (status)
-                       return status;
+                       goto out;
        }
 
        if ((!res->synchronous || !args->sync) &&
                        res->write_res.verifier.committed != NFS_FILE_SYNC) {
                status = process_copy_commit(dst, pos_dst, res);
                if (status)
-                       return status;
+                       goto out;
        }
 
        truncate_pagecache_range(dst_inode, pos_dst,
@@ -546,8 +555,11 @@ static int _nfs42_proc_copy_notify(struct file *src, struct file *dst,
        status = nfs4_set_rw_stateid(&args->cna_src_stateid, ctx, l_ctx,
                                     FMODE_READ);
        nfs_put_lock_context(l_ctx);
-       if (status)
+       if (status) {
+               if (status == -EAGAIN)
+                       status = -NFS4ERR_BAD_STATEID;
                return status;
+       }
 
        status = nfs4_call_sync(src_server->client, src_server, &msg,
                                &args->cna_seq_args, &res->cnr_seq_res, 0);
@@ -618,8 +630,11 @@ static loff_t _nfs42_proc_llseek(struct file *filep,
 
        status = nfs4_set_rw_stateid(&args.sa_stateid, lock->open_context,
                        lock, FMODE_READ);
-       if (status)
+       if (status) {
+               if (status == -EAGAIN)
+                       status = -NFS4ERR_BAD_STATEID;
                return status;
+       }
 
        status = nfs_filemap_write_and_wait_range(inode->i_mapping,
                        offset, LLONG_MAX);
@@ -994,13 +1009,18 @@ static int _nfs42_proc_clone(struct rpc_message *msg, struct file *src_f,
 
        status = nfs4_set_rw_stateid(&args.src_stateid, src_lock->open_context,
                        src_lock, FMODE_READ);
-       if (status)
+       if (status) {
+               if (status == -EAGAIN)
+                       status = -NFS4ERR_BAD_STATEID;
                return status;
-
+       }
        status = nfs4_set_rw_stateid(&args.dst_stateid, dst_lock->open_context,
                        dst_lock, FMODE_WRITE);
-       if (status)
+       if (status) {
+               if (status == -EAGAIN)
+                       status = -NFS4ERR_BAD_STATEID;
                return status;
+       }
 
        res.dst_fattr = nfs_alloc_fattr();
        if (!res.dst_fattr)