nfsd4: look up stateid's per clientid

Use a separate stateid idr per client, and lookup a stateid by first
finding the client, then looking up the stateid relative to that client.

Also some minor refactoring.

This allows us to improve error returns: we can return expired when the
clientid is not found and bad_stateid when the clientid is found but not
the stateid, as opposed to returning expired for both cases.

I hope this will also help to replace the state lock mostly by a
per-client lock, but that hasn't been done yet.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 2429fffa31dd..5779acde7e70 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3287,6 +3287,7 @@ nfsd4_encode_test_stateid(struct nfsd4_compoundres *resp, int nfserr,
                           struct nfsd4_test_stateid *test_stateid)
 {
         struct nfsd4_compoundargs *argp;
+        struct nfs4_client *cl = resp->cstate.session->se_client;
         stateid_t si;
         __be32 *p;
         int i;
@@ -3302,7 +3303,7 @@ nfsd4_encode_test_stateid(struct nfsd4_compoundres *resp, int nfserr,
         nfs4_lock_state();
         for (i = 0; i < test_stateid->ts_num_ids; i++) {
                 nfsd4_decode_stateid(argp, &si);
-                valid = nfs4_validate_stateid(&si);
+                valid = nfs4_validate_stateid(cl, &si);
                 RESERVE_SPACE(4);
                 *p++ = htonl(valid);
                 resp->p = p;