On Fri, Apr 18, 2014 at 02:44:44PM -0400, Trond Myklebust wrote:
> In NFSv4.x with x>0, we want to use the session's pointer to the
> nfs4_client in order to optimise away the extra lookup of the clid.
>
> Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
> ---
> fs/nfsd/nfs4state.c | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 888acf114e40..6e2d348d3367 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -3571,13 +3571,19 @@ void nfsd4_cleanup_open_state(struct nfsd4_open *open, __be32 status)
> put_generic_stateid(open->op_stp);
> }
>
> -static __be32 lookup_clientid(clientid_t *clid, bool session, struct nfsd_net *nn, struct nfs4_client **clp)
> +static __be32 lookup_clientid(clientid_t *clid, struct nfsd4_session *session, struct nfsd_net *nn, struct nfs4_client **clp)
> {
> struct nfs4_client *found;
>
> - if (STALE_CLIENTID(clid, nn))
> - return nfserr_stale_clientid;
> - found = find_confirmed_client(clid, session, nn);
> + if (session != NULL) {
> + found = session->se_client;
> + if (!same_clid(&found->cl_clientid, clid))
> + return nfserr_stale_clientid;
Is that the right error? After your
a8a7c6776f8d74780348bef639581421d85a4376 "nfsd: Don't return
NFS4ERR_STALE_STATEID for NFSv4.1+", nfsd4_lookup_stateid will just
immediately map this to BAD_STATEID. (And the other callers aren't
relevant in the minorversion > 0 case.)
--b.
> + } else {
> + if (STALE_CLIENTID(clid, nn))
> + return nfserr_stale_clientid;
> + found = find_confirmed_client(clid, false, nn);
> + }
> if (clp)
> *clp = found;
> return found ? nfs_ok : nfserr_expired;
> @@ -3594,7 +3600,7 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> nfs4_lock_state();
> dprintk("process_renew(%08x/%08x): starting\n",
> clid->cl_boot, clid->cl_id);
> - status = lookup_clientid(clid, cstate->minorversion, nn, &clp);
> + status = lookup_clientid(clid, NULL, nn, &clp);
> if (status)
> goto out;
> status = nfserr_cb_path_down;
> @@ -3879,14 +3885,13 @@ static __be32 nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,
> {
> struct nfs4_client *cl;
> __be32 status;
> - bool sessions = cstate->minorversion != 0;
>
> if (ZERO_STATEID(stateid) || ONE_STATEID(stateid))
> return nfserr_bad_stateid;
> - status = lookup_clientid(&stateid->si_opaque.so_clid, sessions,
> + status = lookup_clientid(&stateid->si_opaque.so_clid, cstate->session,
> nn, &cl);
> if (status == nfserr_stale_clientid) {
> - if (sessions)
> + if (cstate->session)
> return nfserr_bad_stateid;
> return nfserr_stale_stateid;
> }
> @@ -4770,7 +4775,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> nfs4_lock_state();
>
> if (!nfsd4_has_session(cstate)) {
> - status = lookup_clientid(&lockt->lt_clientid, false, nn, NULL);
> + status = lookup_clientid(&lockt->lt_clientid, NULL, nn, NULL);
> if (status)
> goto out;
> }
> @@ -4942,7 +4947,7 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp,
>
> nfs4_lock_state();
>
> - status = lookup_clientid(clid, cstate->minorversion, nn, NULL);
> + status = lookup_clientid(clid, NULL, nn, NULL);
> if (status)
> goto out;
>
> --
> 1.9.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
