lkml.org 
[lkml]   [2022]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 029/203] SUNRPC allow for unspecified transport time in rpc_clnt_add_xprt
    Date
    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 a312ea2bc4405..c83fe618767c4 100644
    --- a/net/sunrpc/clnt.c
    +++ b/net/sunrpc/clnt.c
    @@ -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);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-02-14 11:40    [W:7.916 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site