nfsd: Convert nfs4_check_open_reclaim() to work with lookup_clientid()

lookup_clientid is preferable to find_confirmed_client since it's able
to use the cached client in the compound state.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 9425ffc4880959e7dfe7ccc6bb1518494d5d8501..29a617ebe38c95030b7f0280810fd45da4720534 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -431,8 +431,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                        break;
                case NFS4_OPEN_CLAIM_PREVIOUS:
                        status = nfs4_check_open_reclaim(&open->op_clientid,
-                                                        cstate->minorversion,
-                                                        nn);
+                                                        cstate, nn);
                        if (status)
                                goto out;
                        open->op_openowner->oo_flags |= NFS4_OO_CONFIRMED;

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index f82aec4193ceeaef1ee3cbbb612284c4a165627f..324e80fbfea929921a3675639287b2c796dd1426 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4969,16 +4969,21 @@ nfsd4_find_reclaim_client(const char *recdir, struct nfsd_net *nn)
 * Called from OPEN. Look for clientid in reclaim list.
 */
 __be32
-nfs4_check_open_reclaim(clientid_t *clid, bool sessions, struct nfsd_net *nn)
+nfs4_check_open_reclaim(clientid_t *clid,
+               struct nfsd4_compound_state *cstate,
+               struct nfsd_net *nn)
 {
-       struct nfs4_client *clp;
+       __be32 status;
 
        /* find clientid in conf_id_hashtbl */
-       clp = find_confirmed_client(clid, sessions, nn);
-       if (clp == NULL)
+       status = lookup_clientid(clid, cstate, nn);
+       if (status)
                return nfserr_reclaim_bad;
 
-       return nfsd4_client_record_check(clp) ? nfserr_reclaim_bad : nfs_ok;
+       if (nfsd4_client_record_check(cstate->clp))
+               return nfserr_reclaim_bad;
+
+       return nfs_ok;
 }
 
 #ifdef CONFIG_NFSD_FAULT_INJECTION

diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index ff160e89701a823bed82ffc0804621d06990bbf4..06d1a908a58e730107577aed17d31432c93ff8f6 100644 (file)
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -457,7 +457,8 @@ void nfs4_remove_reclaim_record(struct nfs4_client_reclaim *, struct nfsd_net *)
 extern void nfs4_release_reclaim(struct nfsd_net *);
 extern struct nfs4_client_reclaim *nfsd4_find_reclaim_client(const char *recdir,
                                                        struct nfsd_net *nn);
-extern __be32 nfs4_check_open_reclaim(clientid_t *clid, bool sessions, struct nfsd_net *nn);
+extern __be32 nfs4_check_open_reclaim(clientid_t *clid,
+               struct nfsd4_compound_state *cstate, struct nfsd_net *nn);
 extern int set_callback_cred(void);
 extern void nfsd4_init_callback(struct nfsd4_callback *);
 extern void nfsd4_probe_callback(struct nfs4_client *clp);