Merge branch 'perf-urgent-for-linus' 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 9637aad36bdcaf81d128228dd4ce72c99dd6a923..e2ae54b35dfe1ff5da1bd1d656327b7b245e2cda 100644 (file)
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -343,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,