From: Andrew Morton <akpm@osdl.org>

futz with whitespace.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
CC: Steven Dickson <SteveD@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@suse.de>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 net/sunrpc/svcsock.c  |   24 +++++++++++-------------
 net/sunrpc/xprtsock.c |   24 +++++++++++-------------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff -puN net/sunrpc/svcsock.c~lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy net/sunrpc/svcsock.c
--- a/net/sunrpc/svcsock.c~lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy
+++ a/net/sunrpc/svcsock.c
@@ -94,20 +94,18 @@ static inline void svc_reclassify_socket
 	struct sock *sk = sock->sk;
 	BUG_ON(sk->sk_lock.owner != NULL);
 	switch (sk->sk_family) {
-		case AF_INET:
-			sock_lock_init_class_and_name(sk,
-				"slock-AF_INET-NFSD", &svc_slock_key[0],
-				"sk_lock-AF_INET-NFSD", &svc_key[0]);
-			break;
-
-		case AF_INET6:
-			sock_lock_init_class_and_name(sk,
-				"slock-AF_INET6-NFSD", &svc_slock_key[1],
-				"sk_lock-AF_INET6-NFSD", &svc_key[1]);
-			break;
+	case AF_INET:
+		sock_lock_init_class_and_name(sk, "slock-AF_INET-NFSD",
+		    &svc_slock_key[0], "sk_lock-AF_INET-NFSD", &svc_key[0]);
+		break;
 
-		default:
-			BUG();
+	case AF_INET6:
+		sock_lock_init_class_and_name(sk, "slock-AF_INET6-NFSD",
+		    &svc_slock_key[1], "sk_lock-AF_INET6-NFSD", &svc_key[1]);
+		break;
+
+	default:
+		BUG();
 	}
 }
 #else
diff -puN net/sunrpc/xprtsock.c~lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy net/sunrpc/xprtsock.c
--- a/net/sunrpc/xprtsock.c~lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy
+++ a/net/sunrpc/xprtsock.c
@@ -1067,20 +1067,18 @@ static inline void xs_reclassify_socket(
 	struct sock *sk = sock->sk;
 	BUG_ON(sk->sk_lock.owner != NULL);
 	switch (sk->sk_family) {
-		case AF_INET:
-			sock_lock_init_class_and_name(sk,
-				"slock-AF_INET-NFS", &xs_slock_key[0],
-				"sk_lock-AF_INET-NFS", &xs_key[0]);
-			break;
-
-		case AF_INET6:
-			sock_lock_init_class_and_name(sk,
-				"slock-AF_INET6-NFS", &xs_slock_key[1],
-				"sk_lock-AF_INET6-NFS", &xs_key[1]);
-			break;
+	case AF_INET:
+		sock_lock_init_class_and_name(sk, "slock-AF_INET-NFS",
+			&xs_slock_key[0], "sk_lock-AF_INET-NFS", &xs_key[0]);
+		break;
+
+	case AF_INET6:
+		sock_lock_init_class_and_name(sk, "slock-AF_INET6-NFS",
+			&xs_slock_key[1], "sk_lock-AF_INET6-NFS", &xs_key[1]);
+		break;
 
-		default:
-			BUG();
+	default:
+		BUG();
 	}
 }
 #else
_