diff options
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/inode.c | 2 | ||||
| -rw-r--r-- | fs/nfs/nfs3proc.c | 2 | ||||
| -rw-r--r-- | fs/nfs/nfs4proc.c | 4 | 
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index c1c7a9d7872..ce727047ee8 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -79,7 +79,7 @@ int nfs_wait_bit_killable(void *word)  {  	if (fatal_signal_pending(current))  		return -ERESTARTSYS; -	freezable_schedule(); +	freezable_schedule_unsafe();  	return 0;  }  EXPORT_SYMBOL_GPL(nfs_wait_bit_killable); diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index 43ea96ced28..ce90eb4775c 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c @@ -33,7 +33,7 @@ nfs3_rpc_wrapper(struct rpc_clnt *clnt, struct rpc_message *msg, int flags)  		res = rpc_call_sync(clnt, msg, flags);  		if (res != -EJUKEBOX)  			break; -		freezable_schedule_timeout_killable(NFS_JUKEBOX_RETRY_TIME); +		freezable_schedule_timeout_killable_unsafe(NFS_JUKEBOX_RETRY_TIME);  		res = -ERESTARTSYS;  	} while (!fatal_signal_pending(current));  	return res; diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d7ba5616989..28241a42f36 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -268,7 +268,7 @@ static int nfs4_delay(struct rpc_clnt *clnt, long *timeout)  		*timeout = NFS4_POLL_RETRY_MIN;  	if (*timeout > NFS4_POLL_RETRY_MAX)  		*timeout = NFS4_POLL_RETRY_MAX; -	freezable_schedule_timeout_killable(*timeout); +	freezable_schedule_timeout_killable_unsafe(*timeout);  	if (fatal_signal_pending(current))  		res = -ERESTARTSYS;  	*timeout <<= 1; @@ -4528,7 +4528,7 @@ int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4  static unsigned long  nfs4_set_lock_task_retry(unsigned long timeout)  { -	freezable_schedule_timeout_killable(timeout); +	freezable_schedule_timeout_killable_unsafe(timeout);  	timeout <<= 1;  	if (timeout > NFS4_LOCK_MAXTIMEOUT)  		return NFS4_LOCK_MAXTIMEOUT;  |