From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Olga Kornievskaia <kolga@netapp.com>,
Anna Schumaker <Anna.Schumaker@Netapp.com>,
Sasha Levin <sashal@kernel.org>,
trond.myklebust@hammerspace.com, anna.schumaker@netapp.com,
chuck.lever@oracle.com, davem@davemloft.net, kuba@kernel.org,
linux-nfs@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.15 11/41] SUNRPC allow for unspecified transport time in rpc_clnt_add_xprt
Date: Thu, 3 Feb 2022 15:32:15 -0500 [thread overview]
Message-ID: <20220203203245.3007-11-sashal@kernel.org> (raw)
In-Reply-To: <20220203203245.3007-1-sashal@kernel.org>
From: Olga Kornievskaia <kolga@netapp.com>
[ Upstream commit b8a09619a56334414cbd7f935a0796240d0cc07e ]
If the supplied argument doesn't specify the transport type, use the
type of the existing rpc clnt and its existing transport.
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
net/sunrpc/clnt.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index f056ff9314442..5da1d7e8468a5 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -2903,7 +2903,7 @@ int rpc_clnt_add_xprt(struct rpc_clnt *clnt,
unsigned long connect_timeout;
unsigned long reconnect_timeout;
unsigned char resvport, reuseport;
- int ret = 0;
+ int ret = 0, ident;
rcu_read_lock();
xps = xprt_switch_get(rcu_dereference(clnt->cl_xpi.xpi_xpswitch));
@@ -2917,8 +2917,11 @@ int rpc_clnt_add_xprt(struct rpc_clnt *clnt,
reuseport = xprt->reuseport;
connect_timeout = xprt->connect_timeout;
reconnect_timeout = xprt->max_reconnect_timeout;
+ ident = xprt->xprt_class->ident;
rcu_read_unlock();
+ if (!xprtargs->ident)
+ xprtargs->ident = ident;
xprt = xprt_create_transport(xprtargs);
if (IS_ERR(xprt)) {
ret = PTR_ERR(xprt);
--
2.34.1
next prev parent reply other threads:[~2022-02-03 20:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-03 20:32 [PATCH AUTOSEL 5.15 01/41] NFS: change nfs_access_get_cached to only report the mask Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 02/41] NFSv4 only print the label when its queried Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 03/41] nfs: nfs4clinet: check the return value of kstrdup() Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 04/41] NFSv4.1: Fix uninitialised variable in devicenotify Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 06/41] NFSv4 remove zero number of fs_locations entries error check Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 07/41] NFSv4 store server support for fs_location attribute Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 08/41] NFSv4.1 query for fs_location attr on a new file system Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 09/41] NFSv4 expose nfs_parse_server_name function Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 10/41] NFSv4 handle port presence in fs_location server string Sasha Levin
2022-02-03 20:32 ` Sasha Levin [this message]
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 12/41] net/sunrpc: fix reference count leaks in rpc_sysfs_xprt_state_change Sasha Levin
2022-02-03 20:32 ` [PATCH AUTOSEL 5.15 13/41] sunrpc: Fix potential race conditions in rpc_sysfs_xprt_state_change() Sasha Levin
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=20220203203245.3007-11-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Anna.Schumaker@Netapp.com \
--cc=chuck.lever@oracle.com \
--cc=davem@davemloft.net \
--cc=kolga@netapp.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=trond.myklebust@hammerspace.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