2 files changed, 8 insertions, 1 deletions

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index d219159b98af..7caa3801ce72 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -1010,8 +1010,9 @@ static void nfsd4_cb_prepare(struct rpc_task *task, void *calldata)
         cb->cb_seq_status = 1;
         cb->cb_status = 0;
         if (minorversion) {
-                if (!nfsd41_cb_get_slot(clp, task))
+                if (!cb->cb_holds_slot && !nfsd41_cb_get_slot(clp, task))
                         return;
+                cb->cb_holds_slot = true;
         }
         rpc_call_start(task);
 }
@@ -1038,6 +1039,9 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback
                 return true;
         }
 
+        if (!cb->cb_holds_slot)
+                goto need_restart;
+
         switch (cb->cb_seq_status) {
         case 0:
                 /*
@@ -1076,6 +1080,7 @@ static bool nfsd4_cb_sequence_done(struct rpc_task *task, struct nfsd4_callback
                         cb->cb_seq_status);
         }
 
+        cb->cb_holds_slot = false;
         clear_bit(0, &clp->cl_cb_slot_busy);
         rpc_wake_up_next(&clp->cl_cb_waitq);
         dprintk("%s: freed slot, new seqid=%d\n", __func__,
@@ -1283,6 +1288,7 @@ void nfsd4_init_cb(struct nfsd4_callback *cb, struct nfs4_client *clp,
         cb->cb_seq_status = 1;
         cb->cb_status = 0;
         cb->cb_need_restart = false;
+        cb->cb_holds_slot = false;
 }
 
 void nfsd4_run_cb(struct nfsd4_callback *cb)
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 396c76755b03..9d6cb246c6c5 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -70,6 +70,7 @@ struct nfsd4_callback {
         int cb_seq_status;
         int cb_status;
         bool cb_need_restart;
+        bool cb_holds_slot;
 };
 
 struct nfsd4_callback_ops {