From 78504f421914e1215807ade53b6ba08fd400ed2a Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 13 Apr 2010 14:07:07 -0700
Subject: [PATCH] --- yaml --- r: 189916 b: refs/heads/master c:
 a6a5349d17f2a5c37079826f1a1474c3d08c6b53 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/ceph/messenger.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 699334b61310..85f9ed57096d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1e4dd0caa63e166afa46a1ccc947bebb4f66bcf
+refs/heads/master: a6a5349d17f2a5c37079826f1a1474c3d08c6b53
diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c
index f35b4945a9c3..5c75d5d32b27 100644
--- a/trunk/fs/ceph/messenger.c
+++ b/trunk/fs/ceph/messenger.c
@@ -29,6 +29,10 @@ static char tag_msg = CEPH_MSGR_TAG_MSG;
 static char tag_ack = CEPH_MSGR_TAG_ACK;
 static char tag_keepalive = CEPH_MSGR_TAG_KEEPALIVE;
 
+#ifdef CONFIG_LOCKDEP
+static struct lock_class_key socket_class;
+#endif
+
 
 static void queue_con(struct ceph_connection *con);
 static void con_work(struct work_struct *);
@@ -227,6 +231,10 @@ static struct socket *ceph_tcp_connect(struct ceph_connection *con)
 	con->sock = sock;
 	sock->sk->sk_allocation = GFP_NOFS;
 
+#ifdef CONFIG_LOCKDEP
+	lockdep_set_class(&sock->sk->sk_lock, &socket_class);
+#endif
+
 	set_sock_callbacks(sock, con);
 
 	dout("connect %s\n", pr_addr(&con->peer_addr.in_addr));