From: J. Bruce Fields <bfields@redhat.com>
Date: Thu, 21 Jan 2021 22:57:37 +0000 (-0500)
Subject: nfsd4: simplify process_lookup1
X-Git-Tag: v5.10.220~593
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f26b1747a2ec827045dc1d8f04b641c76e1d5c9;p=thirdparty%2Fkernel%2Fstable.git

nfsd4: simplify process_lookup1

[ Upstream commit 33311873adb0d55c287b164117b5b4bb7b1bdc40 ]

This STALE_CLIENTID check is redundant with the one in
lookup_clientid().

There's a difference in behavior is in case of memory allocation
failure, which I think isn't a big deal.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index e7ec7593eaaa3..3f26047376368 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4722,8 +4722,6 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate,
 	struct nfs4_openowner *oo = NULL;
 	__be32 status;
 
-	if (STALE_CLIENTID(&open->op_clientid, nn))
-		return nfserr_stale_clientid;
 	/*
 	 * In case we need it later, after we've already created the
 	 * file and don't want to risk a further failure: