NFSD: don't start nfsd if sv_permsocks is empty

Previously, while trying to create a server instance, if no
listening sockets were present then default parameter udp
and tcp listeners were created. It's unclear what purpose
was of starting these listeners were and how this could have
been triggered by the userland setup. This patch proposed
to ensure the reverse that we never end in a situation where
no listener sockets are created and we are trying to create
nfsd threads.

The problem it solves is: when nfs.conf only has tcp=n (and
nothing else for the choice of transports), nfsdctl would
still start the server and create udp and tcp listeners.

Signed-off-by: Olga Kornievskaia <okorniev@redhat.com>
Reviewed-by: NeilBrown <neil@brown.name>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

authored by Olga Kornievskaia and committed by Chuck Lever 14282cc3 b0f8e1f1

+5 -23
+5 -23
fs/nfsd/nfssvc.c
··· 249 249 return rv; 250 250 } 251 251 252 - static int nfsd_init_socks(struct net *net, const struct cred *cred) 253 - { 254 - int error; 255 - struct nfsd_net *nn = net_generic(net, nfsd_net_id); 256 - 257 - if (!list_empty(&nn->nfsd_serv->sv_permsocks)) 258 - return 0; 259 - 260 - error = svc_xprt_create(nn->nfsd_serv, "udp", net, PF_INET, NFS_PORT, 261 - SVC_SOCK_DEFAULTS, cred); 262 - if (error < 0) 263 - return error; 264 - 265 - error = svc_xprt_create(nn->nfsd_serv, "tcp", net, PF_INET, NFS_PORT, 266 - SVC_SOCK_DEFAULTS, cred); 267 - if (error < 0) 268 - return error; 269 - 270 - return 0; 271 - } 272 - 273 252 static int nfsd_users = 0; 274 253 275 254 static int nfsd_startup_generic(void) ··· 356 377 ret = nfsd_startup_generic(); 357 378 if (ret) 358 379 return ret; 359 - ret = nfsd_init_socks(net, cred); 360 - if (ret) 380 + 381 + if (list_empty(&nn->nfsd_serv->sv_permsocks)) { 382 + pr_warn("NFSD: Failed to start, no listeners configured.\n"); 383 + ret = -EIO; 361 384 goto out_socks; 385 + } 362 386 363 387 if (nfsd_needs_lockd(nn) && !nn->lockd_up) { 364 388 ret = lockd_up(net, cred);