From 77a063c651fc78c7e3a54baa3e5ecc7945150d66 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Thu, 9 May 2013 14:56:32 -0500
Subject: [PATCH] --- yaml --- r: 375604 b: refs/heads/master c:
 c10ebbf55b40503a46fb8b29824c9ca1ca089826 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9b837ff51c68..aaada2f939bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c48f3f86e248b1649ad22151dd45ef2610101ed3
+refs/heads/master: c10ebbf55b40503a46fb8b29824c9ca1ca089826
diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c
index a3395fdfbd4f..d5953b87918c 100644
--- a/trunk/net/ceph/osd_client.c
+++ b/trunk/net/ceph/osd_client.c
@@ -1204,6 +1204,7 @@ void ceph_osdc_unregister_linger_request(struct ceph_osd_client *osdc,
 	mutex_lock(&osdc->request_mutex);
 	if (req->r_linger) {
 		__unregister_linger_request(osdc, req);
+		req->r_linger = 0;
 		ceph_osdc_put_request(req);
 	}
 	mutex_unlock(&osdc->request_mutex);
@@ -2120,7 +2121,9 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc,
 	down_read(&osdc->map_sem);
 	mutex_lock(&osdc->request_mutex);
 	__register_request(osdc, req);
-	WARN_ON(req->r_sent);
+	req->r_sent = 0;
+	req->r_got_reply = 0;
+	req->r_completed = 0;
 	rc = __map_request(osdc, req, 0);
 	if (rc < 0) {
 		if (nofail) {