summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2018-11-05 12:17:01 -0500
committerTrond Myklebust <trond.myklebust@hammerspace.com>2018-11-12 16:39:13 -0500
commita1aa09be21fa344d1f5585aab8164bfae55f57e3 (patch)
tree3c89a76c9a6edf6583b1d778c0d70fa6295dfa55 /fs/nfs
parent21a446cf186570168b7281b154b1993968598aca (diff)
downloadblackbird-op-linux-a1aa09be21fa344d1f5585aab8164bfae55f57e3.tar.gz
blackbird-op-linux-a1aa09be21fa344d1f5585aab8164bfae55f57e3.zip
NFSv4: Ensure that the state manager exits the loop on SIGKILL
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 98d1b6a6646a..ffea57885394 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -2604,7 +2604,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
return;
if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0)
return;
- } while (refcount_read(&clp->cl_count) > 1);
+ } while (refcount_read(&clp->cl_count) > 1 && !signalled());
goto out_drain;
out_error:
OpenPOWER on IntegriCloud