Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy...

[mv-sheeva.git] / fs / nfs / direct.c

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index f8e165c7d5a637de762e619e1ddd1a7db4436fb7..16844f98f50e4b6f6ad24eea74470fb6da263adf 100644 (file)
--- 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;