lkml.org 
[lkml]   [2012]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 03/65] sunrpc: clnt: Add missing braces
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.4-stable review patch. If anyone has any objections, please let me know.

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

    From: Joe Perches <joe@perches.com>

    commit cac5d07e3ca696dcacfb123553cf6c722111cfd3 upstream.

    Add a missing set of braces that commit 4e0038b6b24
    ("SUNRPC: Move clnt->cl_server into struct rpc_xprt")
    forgot.

    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/sunrpc/clnt.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/net/sunrpc/clnt.c
    +++ b/net/sunrpc/clnt.c
    @@ -1846,12 +1846,13 @@ call_timeout(struct rpc_task *task)
    return;
    }
    if (RPC_IS_SOFT(task)) {
    - if (clnt->cl_chatty)
    + if (clnt->cl_chatty) {
    rcu_read_lock();
    printk(KERN_NOTICE "%s: server %s not responding, timed out\n",
    clnt->cl_protname,
    rcu_dereference(clnt->cl_xprt)->servername);
    rcu_read_unlock();
    + }
    if (task->tk_flags & RPC_TASK_TIMEOUT)
    rpc_exit(task, -ETIMEDOUT);
    else



    \
     
     \ /
      Last update: 2012-08-14 01:22    [W:2.719 / U:0.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site