lkml.org 
[lkml]   [2021]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 28/50] NFSD: Keep existing listeners on portlist error
    Date
    From: Benjamin Coddington <bcodding@redhat.com>

    [ Upstream commit c20106944eb679fa3ab7e686fe5f6ba30fbc51e5 ]

    If nfsd has existing listening sockets without any processes, then an error
    returned from svc_create_xprt() for an additional transport will remove
    those existing listeners. We're seeing this in practice when userspace
    attempts to create rpcrdma transports without having the rpcrdma modules
    present before creating nfsd kernel processes. Fix this by checking for
    existing sockets before calling nfsd_destroy().

    Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfsd/nfsctl.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
    index f704f90db36c..2418b9d829ae 100644
    --- a/fs/nfsd/nfsctl.c
    +++ b/fs/nfsd/nfsctl.c
    @@ -765,7 +765,10 @@ out_close:
    svc_xprt_put(xprt);
    }
    out_err:
    - nfsd_destroy(net);
    + if (!list_empty(&nn->nfsd_serv->sv_permsocks))
    + nn->nfsd_serv->sv_nrthreads--;
    + else
    + nfsd_destroy(net);
    return err;
    }

    --
    2.33.0


    \
     
     \ /
      Last update: 2021-10-25 21:24    [W:4.154 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site