Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd: find_cpntf_state cleanup

Browse source 
[ Upstream commit 47fdb22dacae78f37701d82a94c16a014186d34e ]

I think this unusual use of struct compound_state could cause confusion.

It's not that much more complicated just to open-code this stateid
lookup.

The only change in behavior should be a different error return in the
case the copy is using a source stateid that is a revoked delegation,
but I doubt that matters.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
[ cel: squashed in fix reported by Coverity ]
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
J. Bruce Fields 2021-01-21 17:57:42 -05:00 • committed by Ksawlii
parent 794841da84
commit 30a20ecc1b
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
fs/nfsd/nfs4state.c
View file

@ -5832,21 +5832,27 @@ static __be32 find_cpntf_state(struct nfsd_net *nn, stateid_t *st,
{ {
__be32 status; __be32 status;
struct nfs4_cpntf_state *cps = NULL; struct nfs4_cpntf_state *cps = NULL;
struct nfsd4_compound_state cstate; struct nfs4_client *found;
status = manage_cpntf_state(nn, st, NULL, &cps); status = manage_cpntf_state(nn, st, NULL, &cps);
if (status) if (status)
return status; return status;
cps->cpntf_time = ktime_get_boottime_seconds(); cps->cpntf_time = ktime_get_boottime_seconds();
memset(&cstate, 0, sizeof(cstate));
status = set_client(&cps->cp_p_clid, &cstate, nn, true); status = nfserr_expired;
if (status) found = lookup_clientid(&cps->cp_p_clid, true, nn);
if (!found)
goto out; goto out;
status = nfsd4_lookup_stateid(&cstate, &cps->cp_p_stateid,
NFS4_DELEG_STID|NFS4_OPEN_STID|NFS4_LOCK_STID, *stid = find_stateid_by_type(found, &cps->cp_p_stateid,
stid, nn); NFS4_DELEG_STID|NFS4_OPEN_STID|NFS4_LOCK_STID);
put_client_renew(cstate.clp); if (*stid)
status = nfs_ok;
else
status = nfserr_bad_stateid;
put_client_renew(found);
out: out:
nfs4_put_cpntf_state(nn, cps); nfs4_put_cpntf_state(nn, cps);
return status; return status;