diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-06-17 10:14:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-13 05:31:25 +0200 |
| commit | 273f86df6960cfc9e6402f0eca7d5b77204c5dd8 (patch) | |
| tree | 6b1fc01c4ea4dd3253924a46765b2c117b37af46 /net | |
| parent | 60a967848c94dc3f4c4a29e0e40c325be10c1919 (diff) | |
| download | kernel-common-273f86df6960cfc9e6402f0eca7d5b77204c5dd8.tar.gz kernel-common-273f86df6960cfc9e6402f0eca7d5b77204c5dd8.tar.bz2 kernel-common-273f86df6960cfc9e6402f0eca7d5b77204c5dd8.zip | |
SUNRPC: Ensure the RPC client only quits on fatal signals
commit 5afa9133cfe67f1bfead6049a9640c9262a7101c upstream.
Fix a couple of instances where we were exiting the RPC client on
arbitrary signals. We should only do so on fatal signals.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/auth_gss/auth_gss.c | 4 | ||||
| -rw-r--r-- | net/sunrpc/clnt.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 50346a6fa17d..007891287219 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -548,13 +548,13 @@ retry: } inode = &gss_msg->inode->vfs_inode; for (;;) { - prepare_to_wait(&gss_msg->waitqueue, &wait, TASK_INTERRUPTIBLE); + prepare_to_wait(&gss_msg->waitqueue, &wait, TASK_KILLABLE); spin_lock(&inode->i_lock); if (gss_msg->ctx != NULL || gss_msg->msg.errno < 0) { break; } spin_unlock(&inode->i_lock); - if (signalled()) { + if (fatal_signal_pending(current)) { err = -ERESTARTSYS; goto out_intr; } diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 154034b675bd..20b989e22e0d 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -938,7 +938,7 @@ call_allocate(struct rpc_task *task) dprintk("RPC: %5u rpc_buffer allocation failed\n", task->tk_pid); - if (RPC_IS_ASYNC(task) || !signalled()) { + if (RPC_IS_ASYNC(task) || !fatal_signal_pending(current)) { task->tk_action = call_allocate; rpc_delay(task, HZ>>4); return; |