SUNRPC: Don't display zero scope IDs
Chuck Lever [Tue, 12 Jan 2010 22:41:20 +0000 (17:41 -0500)]
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>

net/sunrpc/addr.c

index 0756c5d..f845d9d 100644 (file)
@@ -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);