From: Andrew Morton - coding style repair - make one_sock_name() static. Cc: NeilBrown Signed-off-by: Andrew Morton --- net/sunrpc/svcsock.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff -puN net/sunrpc/svcsock.c~knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy net/sunrpc/svcsock.c --- a/net/sunrpc/svcsock.c~knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy +++ a/net/sunrpc/svcsock.c @@ -431,9 +431,10 @@ out: /* * Report socket names for nfsdfs */ -int one_sock_name(char *buf, struct svc_sock *svsk) +static int one_sock_name(char *buf, struct svc_sock *svsk) { int len; + switch(svsk->sk_sk->sk_family) { case AF_INET: len = sprintf(buf, "ipv4 %s %u.%u.%u.%u %d\n", @@ -442,7 +443,8 @@ int one_sock_name(char *buf, struct svc_ NIPQUAD(inet_sk(svsk->sk_sk)->rcv_saddr), inet_sk(svsk->sk_sk)->num); break; - default: len = sprintf(buf, "*unknown-%d*\n", + default: + len = sprintf(buf, "*unknown-%d*\n", svsk->sk_sk->sk_family); } return len; @@ -454,7 +456,8 @@ svc_sock_names(char *buf, struct svc_ser struct svc_sock *svsk; int len = 0; - if (!serv) return 0; + if (!serv) + return 0; spin_lock(&serv->sv_lock); list_for_each_entry(svsk, &serv->sv_permsocks, sk_list) { int onelen = one_sock_name(buf+len, svsk); _