Commit c2010694 authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Chuck Lever
Browse files

NFSD: Keep existing listeners on portlist error 



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: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 2ba5acfb

fs/nfsd/nfsctl.c

+4 −1
Original line number Diff line number Diff line
@@ -793,6 +793,9 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr 
		svc_xprt_put(xprt);

	}

out_err:

	if (!list_empty(&nn->nfsd_serv->sv_permsocks))

		nn->nfsd_serv->sv_nrthreads--;

	 else

		nfsd_destroy(net);

	return err;

}