diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 01:45:47 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 01:45:47 +0100 |
commit | 75659ca0c10992dcb39258518368a0f6f56e935d (patch) | |
tree | 5d014ceb2f10158061a23d0d976f9a613d85e659 /fs/nfs/direct.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched (diff) | |
parent | Remove commented-out code copied from NFS (diff) | |
download | linux-75659ca0c10992dcb39258518368a0f6f56e935d.tar.xz linux-75659ca0c10992dcb39258518368a0f6f56e935d.zip |
Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc: (22 commits)
Remove commented-out code copied from NFS
NFS: Switch from intr mount option to TASK_KILLABLE
Add wait_for_completion_killable
Add wait_event_killable
Add schedule_timeout_killable
Use mutex_lock_killable in vfs_readdir
Add mutex_lock_killable
Use lock_page_killable
Add lock_page_killable
Add fatal_signal_pending
Add TASK_WAKEKILL
exit: Use task_is_*
signal: Use task_is_*
sched: Use task_contributes_to_load, TASK_ALL and TASK_NORMAL
ptrace: Use task_is_*
power: Use task_is_*
wait: Use TASK_NORMAL
proc/base.c: Use task_is_*
proc/array.c: Use TASK_REPORT
perfmon: Use task_is_*
...
Fixed up conflicts in NFS/sunrpc manually..
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r-- | fs/nfs/direct.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index f8e165c7d5a6..16844f98f50e 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -188,17 +188,12 @@ static void nfs_direct_req_release(struct nfs_direct_req *dreq) static ssize_t nfs_direct_wait(struct nfs_direct_req *dreq) { ssize_t result = -EIOCBQUEUED; - struct rpc_clnt *clnt; - sigset_t oldset; /* Async requests don't wait here */ if (dreq->iocb) goto out; - clnt = NFS_CLIENT(dreq->inode); - rpc_clnt_sigmask(clnt, &oldset); - result = wait_for_completion_interruptible(&dreq->completion); - rpc_clnt_sigunmask(clnt, &oldset); + result = wait_for_completion_killable(&dreq->completion); if (!result) result = dreq->error; |