nfsd: Fix message when creating NFSD listener sockets

When the kernel's IPv6 module isn't loaded:

#:~> /usr/sbin/rpc.nfsd --debug 8
rpc.nfsd: knfsd is currently down
rpc.nfsd: Writing version string to kernel: -2 +3 +4 rpc.nfsd: Creating AF_INET TCP socket. rpc.nfsd: Creating AF_INET UDP socket. rpc.nfsd: Creating AF_INET6 TCP socket. rpc.nfsd: Creating AF_INET6 UDP socket.

The last two messages are misleading, since creation of AF_INET6 sockets now fails silently without kernel IPv6 support.

Fixes c31fef7f4beb ('nfsd: ignore unsupported address types')

Signed-off-by Juergen Daubert <[email protected]>

---

 utils/nfsd/nfssvc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

utils/nfsd/nfssvc.c +3 -3

index fc11d23..e8efd06 100644
@@ -168,8 +168,6 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
 			continue;
 		}
 
-		xlog(D_GENERAL, "Creating %s %s socket.", family, proto);
-
 		/* open socket and prepare to hand it off to kernel */
 		sockfd = socket(addr->ai_family, addr->ai_socktype,
 				addr->ai_protocol);

@@ -183,6 +181,9 @@ nfssvc_setfds(const struct addrinfo *hints, const char *node, const char *port)
 			addr = addr->ai_next;
 			continue;
 		}
+
+		xlog(D_GENERAL, "Created %s %s socket.", family, proto);
+
 #ifdef IPV6_SUPPORTED
 		if (addr->ai_family == AF_INET6 &&
 		    setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on))) {
--

To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html