nfsd4: centralize renew_client() calls
There doesn't seem to be any harm to renewing the client a bit earlier, when it is looked up. That saves us from having to sprinkle renew_client calls over quite so many places. Also remove a redundant comment and do a little cleanup. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
parent
01cd4afadb
commit
a50d2ad172
|
@ -931,9 +931,6 @@ renew_client_locked(struct nfs4_client *clp)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Move client to the end to the LRU list.
|
|
||||||
*/
|
|
||||||
dprintk("renewing client (clientid %08x/%08x)\n",
|
dprintk("renewing client (clientid %08x/%08x)\n",
|
||||||
clp->cl_clientid.cl_boot,
|
clp->cl_clientid.cl_boot,
|
||||||
clp->cl_clientid.cl_id);
|
clp->cl_clientid.cl_id);
|
||||||
|
@ -1220,8 +1217,10 @@ find_confirmed_client(clientid_t *clid)
|
||||||
unsigned int idhashval = clientid_hashval(clid->cl_id);
|
unsigned int idhashval = clientid_hashval(clid->cl_id);
|
||||||
|
|
||||||
list_for_each_entry(clp, &conf_id_hashtbl[idhashval], cl_idhash) {
|
list_for_each_entry(clp, &conf_id_hashtbl[idhashval], cl_idhash) {
|
||||||
if (same_clid(&clp->cl_clientid, clid))
|
if (same_clid(&clp->cl_clientid, clid)) {
|
||||||
|
renew_client(clp);
|
||||||
return clp;
|
return clp;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -2372,11 +2371,15 @@ same_owner_str(struct nfs4_stateowner *sop, struct xdr_netobj *owner,
|
||||||
static struct nfs4_openowner *
|
static struct nfs4_openowner *
|
||||||
find_openstateowner_str(unsigned int hashval, struct nfsd4_open *open)
|
find_openstateowner_str(unsigned int hashval, struct nfsd4_open *open)
|
||||||
{
|
{
|
||||||
struct nfs4_stateowner *so = NULL;
|
struct nfs4_stateowner *so;
|
||||||
|
struct nfs4_openowner *oo;
|
||||||
|
|
||||||
list_for_each_entry(so, &open_ownerstr_hashtbl[hashval], so_strhash) {
|
list_for_each_entry(so, &open_ownerstr_hashtbl[hashval], so_strhash) {
|
||||||
if (same_owner_str(so, &open->op_owner, &open->op_clientid))
|
if (same_owner_str(so, &open->op_owner, &open->op_clientid)) {
|
||||||
return container_of(so, struct nfs4_openowner, oo_owner);
|
oo = openowner(so);
|
||||||
|
renew_client(oo->oo_owner.so_client);
|
||||||
|
return oo;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -2536,7 +2539,6 @@ renew:
|
||||||
open->op_openowner = oo;
|
open->op_openowner = oo;
|
||||||
}
|
}
|
||||||
list_del_init(&oo->oo_close_lru);
|
list_del_init(&oo->oo_close_lru);
|
||||||
renew_client(oo->oo_owner.so_client);
|
|
||||||
return nfs_ok;
|
return nfs_ok;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2970,7 +2972,6 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
|
||||||
dprintk("nfsd4_renew: clientid not found!\n");
|
dprintk("nfsd4_renew: clientid not found!\n");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
renew_client(clp);
|
|
||||||
status = nfserr_cb_path_down;
|
status = nfserr_cb_path_down;
|
||||||
if (!list_empty(&clp->cl_delegations)
|
if (!list_empty(&clp->cl_delegations)
|
||||||
&& clp->cl_cb_state != NFSD4_CB_UP)
|
&& clp->cl_cb_state != NFSD4_CB_UP)
|
||||||
|
@ -3275,7 +3276,6 @@ nfs4_preprocess_stateid_op(struct nfsd4_compound_state *cstate,
|
||||||
status = nfs4_check_delegmode(dp, flags);
|
status = nfs4_check_delegmode(dp, flags);
|
||||||
if (status)
|
if (status)
|
||||||
goto out;
|
goto out;
|
||||||
renew_client(dp->dl_stid.sc_client);
|
|
||||||
if (filpp) {
|
if (filpp) {
|
||||||
*filpp = dp->dl_file->fi_deleg_file;
|
*filpp = dp->dl_file->fi_deleg_file;
|
||||||
BUG_ON(!*filpp);
|
BUG_ON(!*filpp);
|
||||||
|
@ -3293,7 +3293,6 @@ nfs4_preprocess_stateid_op(struct nfsd4_compound_state *cstate,
|
||||||
status = nfs4_check_openmode(stp, flags);
|
status = nfs4_check_openmode(stp, flags);
|
||||||
if (status)
|
if (status)
|
||||||
goto out;
|
goto out;
|
||||||
renew_client(stp->st_stateowner->so_client);
|
|
||||||
if (filpp) {
|
if (filpp) {
|
||||||
if (flags & RD_STATE)
|
if (flags & RD_STATE)
|
||||||
*filpp = find_readable_file(stp->st_file);
|
*filpp = find_readable_file(stp->st_file);
|
||||||
|
@ -3412,7 +3411,6 @@ nfs4_preprocess_seqid_op(struct nfsd4_compound_state *cstate, u32 seqid,
|
||||||
return status;
|
return status;
|
||||||
*stpp = openlockstateid(s);
|
*stpp = openlockstateid(s);
|
||||||
cstate->replay_owner = (*stpp)->st_stateowner;
|
cstate->replay_owner = (*stpp)->st_stateowner;
|
||||||
renew_client((*stpp)->st_stateowner->so_client);
|
|
||||||
|
|
||||||
return nfs4_seqid_op_checks(cstate, stateid, seqid, *stpp);
|
return nfs4_seqid_op_checks(cstate, stateid, seqid, *stpp);
|
||||||
}
|
}
|
||||||
|
@ -3643,7 +3641,6 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
|
||||||
status = check_stateid_generation(stateid, &dp->dl_stid.sc_stateid, nfsd4_has_session(cstate));
|
status = check_stateid_generation(stateid, &dp->dl_stid.sc_stateid, nfsd4_has_session(cstate));
|
||||||
if (status)
|
if (status)
|
||||||
goto out;
|
goto out;
|
||||||
renew_client(dp->dl_stid.sc_client);
|
|
||||||
|
|
||||||
unhash_delegation(dp);
|
unhash_delegation(dp);
|
||||||
out:
|
out:
|
||||||
|
|
Loading…
Reference in New Issue