* [PATCH] sunrpc: clnt: Add missing braces
@ 2012-07-18 18:17 Joe Perches
2012-07-20 16:50 ` Joe Perches
0 siblings, 1 reply; 3+ messages in thread
From: Joe Perches @ 2012-07-18 18:17 UTC (permalink / raw)
To: Trond Myklebust, J. Bruce Fields, Chuck Lever
Cc: David S. Miller, linux-nfs, netdev, linux-kernel
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] sunrpc: clnt: Add missing braces
2012-07-18 18:17 [PATCH] sunrpc: clnt: Add missing braces Joe Perches
@ 2012-07-20 16:50 ` Joe Perches
2012-07-20 17:25 ` Myklebust, Trond
0 siblings, 1 reply; 3+ messages in thread
From: Joe Perches @ 2012-07-20 16:50 UTC (permalink / raw)
To: David S. Miller
Cc: Trond Myklebust, J. Bruce Fields, Chuck Lever,
linux-nfs-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
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-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
> ---
> 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-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] sunrpc: clnt: Add missing braces
2012-07-20 16:50 ` Joe Perches
@ 2012-07-20 17:25 ` Myklebust, Trond
0 siblings, 0 replies; 3+ messages in thread
From: Myklebust, Trond @ 2012-07-20 17:25 UTC (permalink / raw)
To: Joe Perches
Cc: David S. Miller, Myklebust, Trond, J. Bruce Fields, Chuck Lever,
<linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
<netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
No. It should go through the NFS client tree.
I can queue it up.
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org
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-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
>> ---
>> 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-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-20 17:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-18 18:17 [PATCH] sunrpc: clnt: Add missing braces Joe Perches
2012-07-20 16:50 ` Joe Perches
2012-07-20 17:25 ` Myklebust, Trond
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).