Commit 7a88efe9 authored Jan 12, 2010 by Chuck Lever Committed by Trond Myklebust Feb 10, 2010

SUNRPC: Don't display zero scope IDs



A zero scope ID means that it wasn't set, so we don't need to append
it to presentation format addresses.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent f1a89a11

net/sunrpc/addr.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,8 @@ static size_t rpc_ntop6(const struct sockaddr *sap,

		if (!(ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL))
		return len;
		if (sin6->sin6_scope_id == 0)
		return len;

		rc = snprintf(scopebuf, sizeof(scopebuf), "%c%u",
		IPV6_SCOPE_DELIMITER, sin6->sin6_scope_id);

Admin message