xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd: rename lookup_clientid->set_client

Browse Source 
[ Upstream commit 460d27091ae2c23e7ac959a61cd481c58832db58 ]

I think this is a better name, and I'm going to reuse elsewhere the code
that does the lookup itself.

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>
This commit is contained in:
J. Bruce Fields
2021-01-21 17:57:40 -05:00
committed by Greg Kroah-Hartman
parent ea92c0768f
commit 1700657468
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fs/nfsd/nfs4state.c
View File

@@ -4675,7 +4675,7 @@ static __be32 nfsd4_check_seqid(struct nfsd4_compound_state *cstate, struct nfs4
return nfserr_bad_seqid; return nfserr_bad_seqid;
} }
static __be32 lookup_clientid(clientid_t *clid, static __be32 set_client(clientid_t *clid,
struct nfsd4_compound_state *cstate, struct nfsd4_compound_state *cstate,
struct nfsd_net *nn, struct nfsd_net *nn,
bool sessions) bool sessions)
@@ -4730,7 +4730,7 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate,
if (open->op_file == NULL) if (open->op_file == NULL)
return nfserr_jukebox; return nfserr_jukebox;
status = lookup_clientid(clientid, cstate, nn, false); status = set_client(clientid, cstate, nn, false);
if (status) if (status)
return status; return status;
clp = cstate->clp; clp = cstate->clp;
@@ -5320,7 +5320,7 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
trace_nfsd_clid_renew(clid); trace_nfsd_clid_renew(clid);
status = lookup_clientid(clid, cstate, nn, false); status = set_client(clid, cstate, nn, false);
if (status) if (status)
return status; return status;
clp = cstate->clp; clp = cstate->clp;
@@ -5701,8 +5701,7 @@ nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,
if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) || if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) ||
CLOSE_STATEID(stateid)) CLOSE_STATEID(stateid))
return nfserr_bad_stateid; return nfserr_bad_stateid;
status = lookup_clientid(&stateid->si_opaque.so_clid, cstate, nn, status = set_client(&stateid->si_opaque.so_clid, cstate, nn, false);
false);
if (status == nfserr_stale_clientid) { if (status == nfserr_stale_clientid) {
if (cstate->session) if (cstate->session)
return nfserr_bad_stateid; return nfserr_bad_stateid;
@@ -5841,7 +5840,7 @@ static __be32 find_cpntf_state(struct nfsd_net *nn, stateid_t *st,
cps->cpntf_time = ktime_get_boottime_seconds(); cps->cpntf_time = ktime_get_boottime_seconds();
memset(&cstate, 0, sizeof(cstate)); memset(&cstate, 0, sizeof(cstate));
status = lookup_clientid(&cps->cp_p_clid, &cstate, nn, true); status = set_client(&cps->cp_p_clid, &cstate, nn, true);
if (status) if (status)
goto out; goto out;
status = nfsd4_lookup_stateid(&cstate, &cps->cp_p_stateid, status = nfsd4_lookup_stateid(&cstate, &cps->cp_p_stateid,
@@ -6933,8 +6932,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
return nfserr_inval; return nfserr_inval;
if (!nfsd4_has_session(cstate)) { if (!nfsd4_has_session(cstate)) {
status = lookup_clientid(&lockt->lt_clientid, cstate, nn, status = set_client(&lockt->lt_clientid, cstate, nn, false);
false);
if (status) if (status)
goto out; goto out;
} }
@@ -7118,7 +7116,7 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp,
dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n", dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n",
clid->cl_boot, clid->cl_id); clid->cl_boot, clid->cl_id);
status = lookup_clientid(clid, cstate, nn, false); status = set_client(clid, cstate, nn, false);
if (status) if (status)
return status; return status;
@@ -7258,7 +7256,7 @@ nfs4_check_open_reclaim(clientid_t *clid,
__be32 status; __be32 status;
/* find clientid in conf_id_hashtbl */ /* find clientid in conf_id_hashtbl */
status = lookup_clientid(clid, cstate, nn, false); status = set_client(clid, cstate, nn, false);
if (status) if (status)
return nfserr_reclaim_bad; return nfserr_reclaim_bad;