From: Tom Rix <trix@redhat.com>
Date: Mon, 17 Jan 2022 17:50:10 +0000 (-0800)
Subject: NFS: simplify check for freeing cn_resp
X-Git-Tag: v5.18-rc1~64^2~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98c27f276be85a73f0babc61c9f8128b7ef593c6;p=thirdparty%2Fkernel%2Flinux.git

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 <trix@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---

diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index e79ae4cbc395e..ba117592a95b9 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;