From: Jeff Layton <jlayton@redhat.com>
To: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: <linux-nfs@vger.kernel.org>, <andros@netapp.com>
Subject: Re: [PATCH v3 01/17] SUNRPC: Deprecate rpc_client->cl_protname
Date: Tue, 3 Sep 2013 08:18:34 -0400 [thread overview]
Message-ID: <20130903081834.5ec7ca7c@tlielax.poochiereds.net> (raw)
In-Reply-To: <1378145820-29990-1-git-send-email-Trond.Myklebust@netapp.com>
On Mon, 2 Sep 2013 14:16:44 -0400
Trond Myklebust <Trond.Myklebust@netapp.com> wrote:
> It just duplicates the cl_program->name, and is not used in any fast
> paths where the extra dereference will cause a hit.
>
> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
> ---
> net/sunrpc/clnt.c | 18 +++++++++---------
> net/sunrpc/rpc_pipe.c | 2 +-
> net/sunrpc/stats.c | 2 +-
> 3 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
> index 74f6a70..e862f8c 100644
> --- a/net/sunrpc/clnt.c
> +++ b/net/sunrpc/clnt.c
> @@ -629,7 +629,7 @@ void rpc_shutdown_client(struct rpc_clnt *clnt)
> might_sleep();
>
> dprintk_rcu("RPC: shutting down %s client for %s\n",
> - clnt->cl_protname,
> + clnt->cl_program->name,
> rcu_dereference(clnt->cl_xprt)->servername);
>
> while (!list_empty(&clnt->cl_tasks)) {
> @@ -649,7 +649,7 @@ static void
> rpc_free_client(struct rpc_clnt *clnt)
> {
> dprintk_rcu("RPC: destroying %s client for %s\n",
> - clnt->cl_protname,
> + clnt->cl_program->name,
> rcu_dereference(clnt->cl_xprt)->servername);
> if (clnt->cl_parent != clnt)
> rpc_release_client(clnt->cl_parent);
> @@ -1299,7 +1299,7 @@ call_start(struct rpc_task *task)
> struct rpc_clnt *clnt = task->tk_client;
>
> dprintk("RPC: %5u call_start %s%d proc %s (%s)\n", task->tk_pid,
> - clnt->cl_protname, clnt->cl_vers,
> + clnt->cl_program->name, clnt->cl_vers,
> rpc_proc_name(task),
> (RPC_IS_ASYNC(task) ? "async" : "sync"));
>
> @@ -1908,7 +1908,7 @@ call_status(struct rpc_task *task)
> default:
> if (clnt->cl_chatty)
> printk("%s: RPC call returned error %d\n",
> - clnt->cl_protname, -status);
> + clnt->cl_program->name, -status);
> rpc_exit(task, status);
> }
> }
> @@ -1939,7 +1939,7 @@ call_timeout(struct rpc_task *task)
> if (clnt->cl_chatty) {
> rcu_read_lock();
> printk(KERN_NOTICE "%s: server %s not responding, timed out\n",
> - clnt->cl_protname,
> + clnt->cl_program->name,
> rcu_dereference(clnt->cl_xprt)->servername);
> rcu_read_unlock();
> }
> @@ -1955,7 +1955,7 @@ call_timeout(struct rpc_task *task)
> if (clnt->cl_chatty) {
> rcu_read_lock();
> printk(KERN_NOTICE "%s: server %s not responding, still trying\n",
> - clnt->cl_protname,
> + clnt->cl_program->name,
> rcu_dereference(clnt->cl_xprt)->servername);
> rcu_read_unlock();
> }
> @@ -1990,7 +1990,7 @@ call_decode(struct rpc_task *task)
> if (clnt->cl_chatty) {
> rcu_read_lock();
> printk(KERN_NOTICE "%s: server %s OK\n",
> - clnt->cl_protname,
> + clnt->cl_program->name,
> rcu_dereference(clnt->cl_xprt)->servername);
> rcu_read_unlock();
> }
> @@ -2015,7 +2015,7 @@ call_decode(struct rpc_task *task)
> goto out_retry;
> }
> dprintk("RPC: %s: too small RPC reply size (%d bytes)\n",
> - clnt->cl_protname, task->tk_status);
> + clnt->cl_program->name, task->tk_status);
> task->tk_action = call_timeout;
> goto out_retry;
> }
> @@ -2287,7 +2287,7 @@ static void rpc_show_task(const struct rpc_clnt *clnt,
> printk(KERN_INFO "%5u %04x %6d %8p %8p %8ld %8p %sv%u %s a:%ps q:%s\n",
> task->tk_pid, task->tk_flags, task->tk_status,
> clnt, task->tk_rqstp, task->tk_timeout, task->tk_ops,
> - clnt->cl_protname, clnt->cl_vers, rpc_proc_name(task),
> + clnt->cl_program->name, clnt->cl_vers, rpc_proc_name(task),
> task->tk_action, rpc_waitq);
> }
>
> diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
> index 017aedc..b36bfb9 100644
> --- a/net/sunrpc/rpc_pipe.c
> +++ b/net/sunrpc/rpc_pipe.c
> @@ -409,7 +409,7 @@ rpc_show_info(struct seq_file *m, void *v)
> rcu_read_lock();
> seq_printf(m, "RPC server: %s\n",
> rcu_dereference(clnt->cl_xprt)->servername);
> - seq_printf(m, "service: %s (%d) version %d\n", clnt->cl_protname,
> + seq_printf(m, "service: %s (%d) version %d\n", clnt->cl_program->name,
> clnt->cl_prog, clnt->cl_vers);
> seq_printf(m, "address: %s\n", rpc_peeraddr2str(clnt, RPC_DISPLAY_ADDR));
> seq_printf(m, "protocol: %s\n", rpc_peeraddr2str(clnt, RPC_DISPLAY_PROTO));
> diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
> index 21b75cb..5453049 100644
> --- a/net/sunrpc/stats.c
> +++ b/net/sunrpc/stats.c
> @@ -188,7 +188,7 @@ void rpc_print_iostats(struct seq_file *seq, struct rpc_clnt *clnt)
>
> seq_printf(seq, "\tRPC iostats version: %s ", RPC_IOSTATS_VERS);
> seq_printf(seq, "p/v: %u/%u (%s)\n",
> - clnt->cl_prog, clnt->cl_vers, clnt->cl_protname);
> + clnt->cl_prog, clnt->cl_vers, clnt->cl_program->name);
>
> rcu_read_lock();
> xprt = rcu_dereference(clnt->cl_xprt);
Thanks Trond!
This set looks good to me, and seems to fix the nfsv3/nfsacl + krb5
problems that were reported recently. I'll plan to do some more
extensive testing with it as I get time...
--
Jeff Layton <jlayton@redhat.com>
prev parent reply other threads:[~2013-09-03 12:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-02 18:16 [PATCH v3 01/17] SUNRPC: Deprecate rpc_client->cl_protname Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 02/17] SUNRPC: Remove unused struct rpc_clnt field cl_protname Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 03/17] SUNRPC: Cleanup rpc_setup_pipedir Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 04/17] RPCSEC_GSS: Clean up upcall message allocation Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 05/17] SUNRPC: Replace clnt->cl_principal Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 06/17] RPCSEC_GSS: Further cleanups Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 07/17] RPCSEC_GSS: Fix an Oopsable condition when creating/destroying pipefs objects Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 08/17] NFSv4: Fix a potentially Oopsable condition in __nfs_idmap_unregister Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 09/17] SUNRPC: Add a framework to clean up management of rpc_pipefs directories Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 10/17] RPCSEC_GSS: Switch auth_gss to use the new framework for pipefs dentries Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 11/17] SUNRPC: Remove the obsolete auth-only interface for pipefs dentry management Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 12/17] NFSv4: Convert idmapper to use the new framework for pipefs dentries Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 13/17] SUNRPC: Remove the rpc_client->cl_dentry Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 14/17] SUNRPC: Add a helper to allow sharing of rpc_pipefs directory objects Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 15/17] RPCSEC_GSS: Share rpc_pipes when an rpc_clnt owns multiple rpcsec auth caches Trond Myklebust
2013-09-02 18:16 ` [PATCH v3 16/17] RPCSEC_GSS: Share all credential caches on a per-transport basis Trond Myklebust
2013-09-02 18:17 ` [PATCH v3 17/17] SUNRPC: rpcauth_create needs to know about rpc_clnt clone status Trond Myklebust
2013-09-03 12:18 ` Jeff Layton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130903081834.5ec7ca7c@tlielax.poochiereds.net \
--to=jlayton@redhat.com \
--cc=Trond.Myklebust@netapp.com \
--cc=andros@netapp.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).