From cf78e56a155a54f7b65778537d72472a0e8c0bec Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Mon, 25 Mar 2013 18:16:11 -0500
Subject: [PATCH] --- yaml --- r: 373369 b: refs/heads/master c:
 dc4b870c97a5006871c259f7e61ea6c79038f731 h: refs/heads/master i:   373367:
 3d7774bc6eb475e9ec460c0e8d260f59c36782cb v: v3

---
 [refs]                      |  2 +-
 trunk/net/ceph/osd_client.c | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index ee31956e129f..8a3354a8acc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9966076cdd952e19f2dd4854cd719be0d7cbebc
+refs/heads/master: dc4b870c97a5006871c259f7e61ea6c79038f731
diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c
index 7041906a55a6..f9276cb26aa2 100644
--- a/trunk/net/ceph/osd_client.c
+++ b/trunk/net/ceph/osd_client.c
@@ -831,14 +831,6 @@ static void __register_request(struct ceph_osd_client *osdc,
 	}
 }
 
-static void register_request(struct ceph_osd_client *osdc,
-			     struct ceph_osd_request *req)
-{
-	mutex_lock(&osdc->request_mutex);
-	__register_request(osdc, req);
-	mutex_unlock(&osdc->request_mutex);
-}
-
 /*
  * called under osdc->request_mutex
  */
@@ -1785,8 +1777,6 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc,
 	ceph_osdc_msg_data_set(req->r_reply, &req->r_data_in);
 	ceph_osdc_msg_data_set(req->r_request, &req->r_data_out);
 
-	register_request(osdc, req);
-
 	down_read(&osdc->map_sem);
 	mutex_lock(&osdc->request_mutex);
 	/*
@@ -1794,6 +1784,7 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc,
 	 * while we dropped request_mutex above, so only send now if
 	 * the request still han't been touched yet.
 	 */
+	__register_request(osdc, req);
 	if (req->r_sent == 0) {
 		rc = __map_request(osdc, req, 0);
 		if (rc < 0) {