The patch titled
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy
has been removed from the -mm tree. Its filename is
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy.patch
This patch was dropped because it was folded into knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports.patch
------------------------------------------------------
Subject: knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy
From: Andrew Morton <akpm@xxxxxxxx>
- coding style repair
- make one_sock_name() static.
Cc: NeilBrown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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);
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
list-module-taint-flags-in-oops-panic.patch
move-pidmap-to-pspaceh.patch
isdn-work-around-excessive-udelay.patch
knfsd-add-a-callback-for-when-last-rpc-thread-finishes.patch
knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-fix.patch
knfsd-drop-serv-option-to-svc_recv-and-svc_process-nfs-callback-fix-nfs-callback-fix.patch
knfsd-move-tempsock-aging-to-a-timer-tidy.patch
namespaces-add-nsproxy.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit-sparc.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
ipc-namespace-core.patch
rename-the-provided-execve-functions-to-kernel_execve-headers-fix.patch
replace-cad_pid-by-a-struct-pid-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
