Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

1 files changed, 31 insertions, 0 deletions

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 3bb232eb5d9..49cabffd7fd 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1173,6 +1173,35 @@ static int xs_bindresvport(struct sock_xprt *transport, struct socket *sock)
         return err;
 }
 
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+static struct lock_class_key xs_key[2];
+static struct lock_class_key xs_slock_key[2];
+
+static inline void xs_reclassify_socket(struct socket *sock)
+{
+        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;
+
+        default:
+                BUG();
+        }
+}
+#else
+static inline void xs_reclassify_socket(struct socket *sock)
+{
+}
+#endif
+
 /**
  * xs_udp_connect_worker - set up a UDP socket
  * @work: RPC transport to connect
@@ -1197,6 +1226,7 @@ static void xs_udp_connect_worker(struct work_struct *work)
                 dprintk("RPC:      can't create UDP transport socket (%d).\n", -err);
                 goto out;
         }
+        xs_reclassify_socket(sock);
 
         if (xprt->resvport && xs_bindresvport(transport, sock) < 0) {
                 sock_release(sock);
@@ -1282,6 +1312,7 @@ static void xs_tcp_connect_worker(struct work_struct *work)
                         dprintk("RPC:      can't create TCP transport socket (%d).\n", -err);
                         goto out;
                 }
+                xs_reclassify_socket(sock);
 
                 if (xprt->resvport && xs_bindresvport(transport, sock) < 0) {
                         sock_release(sock);