Merge tag 'nfs-for-6.1-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[sfrench/cifs-2.6.git] / fs / nfs / nfs4state.c

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index beb9448df515f0615dd8216316da5737838a2f53..c3503fb26fa271f1073ede4876331aa2df92cb4e 100644 (file)
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1312,7 +1312,8 @@ int nfs4_wait_clnt_recover(struct nfs_client *clp)
 
        refcount_inc(&clp->cl_count);
        res = wait_on_bit_action(&clp->cl_state, NFS4CLNT_MANAGER_RUNNING,
-                                nfs_wait_bit_killable, TASK_KILLABLE);
+                                nfs_wait_bit_killable,
+                                TASK_KILLABLE|TASK_FREEZABLE_UNSAFE);
        if (res)
                goto out;
        if (clp->cl_cons_state < 0)