nfsd4: less confusing nfsd4_compound_in_session
authorJ. Bruce Fields <bfields@redhat.com>
Wed, 11 Apr 2018 20:53:36 +0000 (16:53 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Sun, 17 Jun 2018 14:42:27 +0000 (10:42 -0400)
Make the function prototype match the name a little better.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4state.c

index 9b2ce80abee0b8b87d6d76defe007aa66a1e9553..cfd0ac5c1c5b130770043ac6ed458e393ae2cb31 100644 (file)
@@ -2956,11 +2956,11 @@ out_no_session:
        return status;
 }
 
-static bool nfsd4_compound_in_session(struct nfsd4_session *session, struct nfs4_sessionid *sid)
+static bool nfsd4_compound_in_session(struct nfsd4_compound_state *cstate, struct nfs4_sessionid *sid)
 {
-       if (!session)
+       if (!cstate->session)
                return false;
-       return !memcmp(sid, &session->se_sessionid, sizeof(*sid));
+       return !memcmp(sid, &cstate->session->se_sessionid, sizeof(*sid));
 }
 
 __be32
@@ -2975,7 +2975,7 @@ nfsd4_destroy_session(struct svc_rqst *r, struct nfsd4_compound_state *cstate,
        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
 
        status = nfserr_not_only_op;
-       if (nfsd4_compound_in_session(cstate->session, &sessionid->sessionid)) {
+       if (nfsd4_compound_in_session(cstate, &sessionid->sessionid)) {
                if (!nfsd4_last_compound_op(r))
                        goto out;
                ref_held_by_me++;