5 files changed, 47 insertions, 33 deletions

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index cf6e4190e41c..0840fc4f7e4a 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -754,9 +754,9 @@ static void do_probe_callback(struct nfs4_client *clp)
  */
 void nfsd4_probe_callback(struct nfs4_client *clp)
 {
-        /* XXX: atomicity?  Also, should we be using cl_cb_flags? */
+        /* XXX: atomicity?  Also, should we be using cl_flags? */
         clp->cl_cb_state = NFSD4_CB_UNKNOWN;
-        set_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_cb_flags);
+        set_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags);
         do_probe_callback(clp);
 }
 
@@ -915,7 +915,7 @@ void nfsd4_destroy_callback_queue(void)
 /* must be called under the state lock */
 void nfsd4_shutdown_callback(struct nfs4_client *clp)
 {
-        set_bit(NFSD4_CLIENT_KILL, &clp->cl_cb_flags);
+        set_bit(NFSD4_CLIENT_CB_KILL, &clp->cl_flags);
         /*
          * Note this won't actually result in a null callback;
          * instead, nfsd4_do_callback_rpc() will detect the killed
@@ -966,15 +966,15 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb)
                 svc_xprt_put(clp->cl_cb_conn.cb_xprt);
                 clp->cl_cb_conn.cb_xprt = NULL;
         }
-        if (test_bit(NFSD4_CLIENT_KILL, &clp->cl_cb_flags))
+        if (test_bit(NFSD4_CLIENT_CB_KILL, &clp->cl_flags))
                 return;
         spin_lock(&clp->cl_lock);
         /*
          * Only serialized callback code is allowed to clear these
          * flags; main nfsd code can only set them:
          */
-        BUG_ON(!clp->cl_cb_flags);
-        clear_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_cb_flags);
+        BUG_ON(!(clp->cl_flags & NFSD4_CLIENT_CB_FLAG_MASK));
+        clear_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags);
         memcpy(&conn, &cb->cb_clp->cl_cb_conn, sizeof(struct nfs4_cb_conn));
         c = __nfsd4_find_backchannel(clp);
         if (c) {
@@ -1000,7 +1000,7 @@ void nfsd4_do_callback_rpc(struct work_struct *w)
         struct nfs4_client *clp = cb->cb_clp;
         struct rpc_clnt *clnt;
 
-        if (clp->cl_cb_flags)
+        if (clp->cl_flags & NFSD4_CLIENT_CB_FLAG_MASK)
                 nfsd4_process_cb_update(cb);
 
         clnt = clp->cl_cb_client;
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 2a9036670b8f..2ed14dfd00a2 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -319,7 +319,8 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
          * Before RECLAIM_COMPLETE done, server should deny new lock
          */
         if (nfsd4_has_session(cstate) &&
-            !cstate->session->se_client->cl_firststate &&
+            !test_bit(NFSD4_CLIENT_RECLAIM_COMPLETE,
+                      &cstate->session->se_client->cl_flags) &&
             open->op_claim_type != NFS4_OPEN_CLAIM_PREVIOUS)
                 return nfserr_grace;
 
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 0b3e875d1abd..6523809839c3 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -126,9 +126,8 @@ void nfsd4_create_clid_dir(struct nfs4_client *clp)
 
         dprintk("NFSD: nfsd4_create_clid_dir for \"%s\"\n", dname);
 
-        if (clp->cl_firststate)
+        if (test_and_set_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags))
                 return;
-        clp->cl_firststate = 1;
         if (!rec_file)
                 return;
         status = nfs4_save_creds(&original_cred);
@@ -271,13 +270,13 @@ nfsd4_remove_clid_dir(struct nfs4_client *clp)
         const struct cred *original_cred;
         int status;
 
-        if (!rec_file || !clp->cl_firststate)
+        if (!rec_file || !test_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags))
                 return;
 
         status = mnt_want_write_file(rec_file);
         if (status)
                 goto out;
-        clp->cl_firststate = 0;
+        clear_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags);
 
         status = nfs4_save_creds(&original_cred);
         if (status < 0)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index a0a2b535b0e0..8be612abd0d7 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2069,7 +2069,8 @@ nfsd4_reclaim_complete(struct svc_rqst *rqstp, struct nfsd4_compound_state *csta
 
         nfs4_lock_state();
         status = nfserr_complete_already;
-        if (cstate->session->se_client->cl_firststate)
+        if (test_and_set_bit(NFSD4_CLIENT_RECLAIM_COMPLETE,
+                             &cstate->session->se_client->cl_flags))
                 goto out;
 
         status = nfserr_stale_clientid;
@@ -2816,12 +2817,6 @@ static void
 nfs4_set_claim_prev(struct nfsd4_open *open, bool has_session)
 {
         open->op_openowner->oo_flags |= NFS4_OO_CONFIRMED;
-        /*
-         * On a 4.1+ client, we don't create a state record for a client
-         * until it performs RECLAIM_COMPLETE:
-         */
-        if (!has_session)
-                open->op_openowner->oo_owner.so_client->cl_firststate = 1;
 }
 
 /* Should we give out recallable state?: */
@@ -4462,7 +4457,7 @@ nfs4_has_reclaimed_state(const char *name, bool use_exchange_id)
         clp = find_confirmed_client_by_str(name, strhashval);
         if (!clp)
                 return 0;
-        return clp->cl_firststate;
+        return test_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags);
 }
 
 /*
@@ -4507,18 +4502,11 @@ nfs4_release_reclaim(void)
 /*
  * called from OPEN, CLAIM_PREVIOUS with a new clientid. */
 static struct nfs4_client_reclaim *
-nfs4_find_reclaim_client(clientid_t *clid)
+nfsd4_find_reclaim_client(struct nfs4_client *clp)
 {
         unsigned int strhashval;
-        struct nfs4_client *clp;
         struct nfs4_client_reclaim *crp = NULL;
 
-
-        /* find clientid in conf_id_hashtbl */
-        clp = find_confirmed_client(clid);
-        if (clp == NULL)
-                return NULL;
-
         dprintk("NFSD: nfs4_find_reclaim_client for %.*s with recdir %s\n",
                             clp->cl_name.len, clp->cl_name.data,
                             clp->cl_recdir);
@@ -4533,13 +4521,36 @@ nfs4_find_reclaim_client(clientid_t *clid)
         return NULL;
 }
 
+static int
+nfsd4_client_record_check(struct nfs4_client *clp)
+{
+        /* did we already find that this client is stable? */
+        if (test_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags))
+                return 0;
+
+        /* look for it in the reclaim hashtable otherwise */
+        if (nfsd4_find_reclaim_client(clp)) {
+                set_bit(NFSD4_CLIENT_STABLE, &clp->cl_flags);
+                return 0;
+        }
+
+        return -ENOENT;
+}
+
 /*
 * Called from OPEN. Look for clientid in reclaim list.
 */
 __be32
 nfs4_check_open_reclaim(clientid_t *clid)
 {
-        return nfs4_find_reclaim_client(clid) ? nfs_ok : nfserr_reclaim_bad;
+        struct nfs4_client *clp;
+
+        /* find clientid in conf_id_hashtbl */
+        clp = find_confirmed_client(clid);
+        if (clp == NULL)
+                return nfserr_reclaim_bad;
+
+        return nfsd4_client_record_check(clp) ? nfserr_reclaim_bad : nfs_ok;
 }
 
 #ifdef CONFIG_NFSD_FAULT_INJECTION
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 1e2b582bc9dc..115215723f76 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -236,14 +236,17 @@ struct nfs4_client {
         struct svc_cred         cl_cred;        /* setclientid principal */
         clientid_t              cl_clientid;    /* generated by server */
         nfs4_verifier           cl_confirm;     /* generated by server */
-        u32                     cl_firststate;  /* recovery dir creation */
         u32                     cl_minorversion;
 
         /* for v4.0 and v4.1 callbacks: */
         struct nfs4_cb_conn     cl_cb_conn;
-#define NFSD4_CLIENT_CB_UPDATE  1
-#define NFSD4_CLIENT_KILL       2
-        unsigned long           cl_cb_flags;
+#define NFSD4_CLIENT_CB_UPDATE          (0)
+#define NFSD4_CLIENT_CB_KILL            (1)
+#define NFSD4_CLIENT_STABLE             (2)     /* client on stable storage */
+#define NFSD4_CLIENT_RECLAIM_COMPLETE   (3)     /* reclaim_complete done */
+#define NFSD4_CLIENT_CB_FLAG_MASK       (1 << NFSD4_CLIENT_CB_UPDATE | \
+                                         1 << NFSD4_CLIENT_CB_KILL)
+        unsigned long           cl_flags;
         struct rpc_clnt         *cl_cb_client;
         u32                     cl_cb_ident;
 #define NFSD4_CB_UP             0