From: <andros@netapp.com>
To: <trond.myklebust@primarydata.com>
Cc: <bfields@fieldses.org>, <chuck.lever@oracle.com>,
<linux-nfs@vger.kernel.org>, Andy Adamson <andros@netapp.com>
Subject: [PATCH Version 4 06/10] SUNRPC add flag to rpc_task_release_client
Date: Wed, 11 May 2016 15:08:21 -0400 [thread overview]
Message-ID: <1462993705-14673-7-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1462993705-14673-1-git-send-email-andros@netapp.com>
From: Andy Adamson <andros@netapp.com>
Want to specify which rpc_xprt to use in rpc_run_task.
Don't pass in an rpc_xprt in rpc_init_task just to have it not used as it
is removed in rpc_task_release_client.
Signed-off-by: Andy Adamson <andros@netapp.com>
---
include/linux/sunrpc/clnt.h | 2 +-
net/sunrpc/clnt.c | 6 +++---
net/sunrpc/sched.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 9a7ddba..b2c5b75 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -150,7 +150,7 @@ int rpc_switch_client_transport(struct rpc_clnt *,
void rpc_shutdown_client(struct rpc_clnt *);
void rpc_release_client(struct rpc_clnt *);
-void rpc_task_release_client(struct rpc_task *);
+void rpc_task_release_client(struct rpc_task *, int);
int rpcb_create_local(struct net *);
void rpcb_put_local(struct net *);
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 7e0c9bf..e157d09 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -942,7 +942,7 @@ out:
}
EXPORT_SYMBOL_GPL(rpc_bind_new_program);
-void rpc_task_release_client(struct rpc_task *task)
+void rpc_task_release_client(struct rpc_task *task, int rm_xprt)
{
struct rpc_clnt *clnt = task->tk_client;
struct rpc_xprt *xprt = task->tk_xprt;
@@ -957,7 +957,7 @@ void rpc_task_release_client(struct rpc_task *task)
rpc_release_client(clnt);
}
- if (xprt != NULL) {
+ if (rm_xprt && xprt) {
task->tk_xprt = NULL;
xprt_put(xprt);
@@ -969,7 +969,7 @@ void rpc_task_set_client(struct rpc_task *task, struct rpc_clnt *clnt)
{
if (clnt != NULL) {
- rpc_task_release_client(task);
+ rpc_task_release_client(task, 0);
if (task->tk_xprt == NULL)
task->tk_xprt = xprt_iter_get_next(&clnt->cl_xpi);
task->tk_client = clnt;
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index fcfd48d..0dacd9c 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -993,7 +993,7 @@ static void rpc_release_resources_task(struct rpc_task *task)
put_rpccred(task->tk_msg.rpc_cred);
task->tk_msg.rpc_cred = NULL;
}
- rpc_task_release_client(task);
+ rpc_task_release_client(task, 1);
}
static void rpc_final_put_task(struct rpc_task *task,
--
1.8.3.1
next prev parent reply other threads:[~2016-05-11 19:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-11 19:08 [PATCH Version 4 00/11] NFSV4.1,2 session trunking andros
2016-05-11 19:08 ` [PATCH Version 4 01/10] NFS default callback ops andros
2016-05-17 20:17 ` Anna Schumaker
2016-05-17 20:21 ` Adamson, Andy
2016-05-11 19:08 ` [PATCH Version 4 02/10] NFS refactor nfs4_match_clientids andros
2016-05-11 19:08 ` [PATCH Version 4 03/10] NFS refactor nfs4_check_serverowner_major_id andros
2016-05-18 14:12 ` Anna Schumaker
2016-05-11 19:08 ` [PATCH Version 4 04/10] NFS detect session trunking andros
2016-05-11 19:08 ` [PATCH Version 4 05/10] NFS refactor _nfs4_proc_exchange_id for " andros
2016-05-11 19:08 ` andros [this message]
2016-05-11 19:08 ` [PATCH Version 4 07/10] NFS probe pseudo-fs for replicas andros
2016-05-18 16:06 ` Anna Schumaker
2016-05-11 19:08 ` [PATCH Version 4 08/10] NFS test and add multipaths for session trunking andros
2016-05-18 18:23 ` Anna Schumaker
2016-05-19 17:46 ` Adamson, Andy
2016-05-11 19:08 ` [PATCH Version 4 09/10] NFS test pnfs data server multipath session trunking aliases andros
2016-05-11 19:08 ` [PATCH Version 4 10/10] NFS add multiaddr to nfs_show_nfsv4_options andros
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=1462993705-14673-7-git-send-email-andros@netapp.com \
--to=andros@netapp.com \
--cc=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
/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).