lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SUNRPC: Ensure the RPC client only quits on fatal signals

Browse Source 
Fix a couple of instances where we were exiting the RPC client on
arbitrary signals. We should only do so on fatal signals.

Cc: stable@kernel.org
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust
2011-06-17 10:14:59 -04:00
parent ee7b75fc4f
commit 5afa9133cf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/sunrpc/auth_gss/auth_gss.c
View File

@@ -577,13 +577,13 @@ retry:
} }
inode = &gss_msg->inode->vfs_inode; inode = &gss_msg->inode->vfs_inode;
for (;;) { for (;;) {
prepare_to_wait(&gss_msg->waitqueue, &wait, TASK_INTERRUPTIBLE); prepare_to_wait(&gss_msg->waitqueue, &wait, TASK_KILLABLE);
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
if (gss_msg->ctx != NULL || gss_msg->msg.errno < 0) { if (gss_msg->ctx != NULL || gss_msg->msg.errno < 0) {
break; break;
} }
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
if (signalled()) { if (fatal_signal_pending(current)) {
err = -ERESTARTSYS; err = -ERESTARTSYS;
goto out_intr; goto out_intr;
} }

2
net/sunrpc/clnt.c
View File

@@ -1061,7 +1061,7 @@ call_allocate(struct rpc_task *task)
dprintk("RPC: %5u rpc_buffer allocation failed\n", task->tk_pid); 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; task->tk_action = call_allocate;
rpc_delay(task, HZ>>4); rpc_delay(task, HZ>>4);
return; return;