From ffee4d4f9e0719b1b61332ee32922fc645b51c6b Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@dreamhost.com>
Date: Tue, 14 Feb 2012 14:05:33 -0600
Subject: [PATCH] --- yaml --- r: 296512 b: refs/heads/master c:
 e0f43c9419c1900e5b50de4261e9686a45a0a2b8 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/include/linux/ceph/messenger.h | 2 --
 trunk/net/ceph/messenger.c           | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c31f7913dd48..d3c8afab7bd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 859eb7994876f26fd9f52d9589fbcab8e2fe8069
+refs/heads/master: e0f43c9419c1900e5b50de4261e9686a45a0a2b8
diff --git a/trunk/include/linux/ceph/messenger.h b/trunk/include/linux/ceph/messenger.h
index 6b5af5f976d1..5ca0f8244203 100644
--- a/trunk/include/linux/ceph/messenger.h
+++ b/trunk/include/linux/ceph/messenger.h
@@ -14,8 +14,6 @@
 struct ceph_msg;
 struct ceph_connection;
 
-extern struct workqueue_struct *ceph_msgr_wq;       /* receive work queue */
-
 /*
  * Ceph defines these callbacks for handling connection events.
  */
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index 04d2b975ab0c..31f59ac03d8a 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -97,7 +97,7 @@ static void encode_my_addr(struct ceph_messenger *msgr)
 /*
  * work queue for all reading and writing to/from the socket.
  */
-struct workqueue_struct *ceph_msgr_wq;
+static struct workqueue_struct *ceph_msgr_wq;
 
 int ceph_msgr_init(void)
 {