diff options
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d9f4d78c3413..dcda0ba7af60 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -55,6 +55,7 @@ | |||
55 | #include <linux/sunrpc/bc_xprt.h> | 55 | #include <linux/sunrpc/bc_xprt.h> |
56 | #include <linux/xattr.h> | 56 | #include <linux/xattr.h> |
57 | #include <linux/utsname.h> | 57 | #include <linux/utsname.h> |
58 | #include <linux/freezer.h> | ||
58 | 59 | ||
59 | #include "nfs4_fs.h" | 60 | #include "nfs4_fs.h" |
60 | #include "delegation.h" | 61 | #include "delegation.h" |
@@ -243,7 +244,7 @@ static int nfs4_delay(struct rpc_clnt *clnt, long *timeout) | |||
243 | *timeout = NFS4_POLL_RETRY_MIN; | 244 | *timeout = NFS4_POLL_RETRY_MIN; |
244 | if (*timeout > NFS4_POLL_RETRY_MAX) | 245 | if (*timeout > NFS4_POLL_RETRY_MAX) |
245 | *timeout = NFS4_POLL_RETRY_MAX; | 246 | *timeout = NFS4_POLL_RETRY_MAX; |
246 | schedule_timeout_killable(*timeout); | 247 | freezable_schedule_timeout_killable(*timeout); |
247 | if (fatal_signal_pending(current)) | 248 | if (fatal_signal_pending(current)) |
248 | res = -ERESTARTSYS; | 249 | res = -ERESTARTSYS; |
249 | *timeout <<= 1; | 250 | *timeout <<= 1; |
@@ -3958,7 +3959,7 @@ int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4 | |||
3958 | static unsigned long | 3959 | static unsigned long |
3959 | nfs4_set_lock_task_retry(unsigned long timeout) | 3960 | nfs4_set_lock_task_retry(unsigned long timeout) |
3960 | { | 3961 | { |
3961 | schedule_timeout_killable(timeout); | 3962 | freezable_schedule_timeout_killable(timeout); |
3962 | timeout <<= 1; | 3963 | timeout <<= 1; |
3963 | if (timeout > NFS4_LOCK_MAXTIMEOUT) | 3964 | if (timeout > NFS4_LOCK_MAXTIMEOUT) |
3964 | return NFS4_LOCK_MAXTIMEOUT; | 3965 | return NFS4_LOCK_MAXTIMEOUT; |