lkml.org 
[lkml]   [2011]   [Jul]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[18/35] SUNRPC: Ensure the RPC client only quits on fatal signals
    2.6.33-longterm review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    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>

    ---
    net/sunrpc/auth_gss/auth_gss.c | 4 ++--
    net/sunrpc/clnt.c | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- 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;
    }
    --- 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;



    \
     
     \ /
      Last update: 2011-07-09 08:09    [W:0.022 / U:1.404 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site