1 files changed, 6 insertions, 4 deletions

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 62ae0fd345ad..ffea57885394 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -2601,11 +2601,12 @@ static void nfs4_state_manager(struct nfs_client *clp)
                 nfs4_clear_state_manager_bit(clp);
                 /* Did we race with an attempt to give us more work? */
                 if (clp->cl_state == 0)
-                        break;
+                        return;
                 if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0)
-                        break;
-        } while (refcount_read(&clp->cl_count) > 1);
-        return;
+                        return;
+        } while (refcount_read(&clp->cl_count) > 1 && !signalled());
+        goto out_drain;
+
 out_error:
         if (strlen(section))
                 section_sep = ": ";
@@ -2613,6 +2614,7 @@ out_error:
                         " with error %d\n", section_sep, section,
                         clp->cl_hostname, -status);
         ssleep(1);
+out_drain:
         nfs4_end_drain_session(clp);
         nfs4_clear_state_manager_bit(clp);
 }