[PATCH v2] NFS: simplify check for freeing cn_resp

trix@redhat.com posted 1 patch 4 years, 5 months ago
fs/nfs/nfs4file.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH v2] NFS: simplify check for freeing cn_resp
Posted by trix@redhat.com 4 years, 5 months ago
From: Tom Rix <trix@redhat.com>

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>
---
v2: remove if check, just do the free

fs/nfs/nfs4file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 @@ static ssize_t __nfs4_copy_file_range(struct file *file_in, loff_t pos_in,
 	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;
-- 
2.26.3