aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rix <[email protected]>2022-01-17 09:50:10 -0800
committerTrond Myklebust <[email protected]>2022-02-25 15:07:07 -0500
commit98c27f276be85a73f0babc61c9f8128b7ef593c6 (patch)
tree139677122e5b882e3d72c78e8882b2fa5e6d84b8
parent53ab78cd6d5aba25575a7cfb95729336ba9497d8 (diff)
NFS: simplify check for freeing cn_resp
nfs42_files_from_same_server() is called to check if freeing cn_resp is required, just do the free. Signed-off-by: Tom Rix <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
-rw-r--r--fs/nfs/nfs4file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index e79ae4cbc395..ba117592a95b 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -180,8 +180,8 @@ retry:
ret = nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count,
nss, cnrs, sync);
out:
- if (!nfs42_files_from_same_server(file_in, file_out))
- kfree(cn_resp);
+ kfree(cn_resp);
+
if (ret == -EAGAIN)
goto retry;
return ret;