| Message ID | 1342635431.9551.41.camel@joe2Laptop (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 2012-07-18 at 11:17 -0700, Joe Perches wrote: > 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> > --- > net/sunrpc/clnt.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c > index f56f045..aaf70aa 100644 > --- a/net/sunrpc/clnt.c > +++ b/net/sunrpc/clnt.c > @@ -1844,12 +1844,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 Hi David. I think it'd be good to get this into 3.6 as a bug fix. This is marked in netdev patchwork as "not applicable". Do you need the sunrpc maintainers to apply or ack it and then push it to you? Trond? Bruce? -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
No. It should go through the NFS client tree. I can queue it up. -- Trond Myklebust Linux NFS client maintainer NetApp Trond.Myklebust@netapp.com www.netapp.com On Jul 20, 2012, at 6:50 PM, Joe Perches wrote: > On Wed, 2012-07-18 at 11:17 -0700, Joe Perches wrote: >> 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> >> --- >> net/sunrpc/clnt.c | 3 ++- >> 1 files changed, 2 insertions(+), 1 deletions(-) >> >> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c >> index f56f045..aaf70aa 100644 >> --- a/net/sunrpc/clnt.c >> +++ b/net/sunrpc/clnt.c >> @@ -1844,12 +1844,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 > > Hi David. > > I think it'd be good to get this into 3.6 as a bug fix. > > This is marked in netdev patchwork as "not applicable". > > Do you need the sunrpc maintainers to apply or ack it > and then push it to you? > > Trond? Bruce? > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index f56f045..aaf70aa 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1844,12 +1844,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
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> --- net/sunrpc/clnt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html