Commit b8a09619 authored by Olga Kornievskaia's avatar Olga Kornievskaia Committed by Anna Schumaker
Browse files

SUNRPC allow for unspecified transport time in rpc_clnt_add_xprt 



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: default avatarOlga Kornievskaia <kolga@netapp.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent a8d54bab

net/sunrpc/clnt.c

+4 −1
Original line number Diff line number Diff line
@@ -2900,7 +2900,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));
@@ -2914,8 +2914,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);