From: Sage Weil <sage@newdream.net>
Date: Fri, 9 Oct 2009 17:31:32 +0000 (-0700)
Subject: ceph: cancel osd requests before resending them
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=266673db423e6ab247170d6c6d72ec36e530a911;p=openwrt%2Fstaging%2Fblogic.git

ceph: cancel osd requests before resending them

This ensures we don't submit the same request twice if we are kicking a
specific osd (as with an osd_reset), or when we hit a transient error and
resend.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c
index 4a8b4f08d4ae..8e33928647f4 100644
--- a/fs/ceph/osd_client.c
+++ b/fs/ceph/osd_client.c
@@ -813,10 +813,13 @@ static void kick_requests(struct ceph_osd_client *osdc,
 
 		if (req->r_resend) {
 			dout(" r_resend set on tid %llu\n", req->r_tid);
+			__cancel_request(req);
 			goto kick;
 		}
-		if (req->r_osd && kickosd == req->r_osd)
+		if (req->r_osd && kickosd == req->r_osd) {
+			__cancel_request(req);
 			goto kick;
+		}
 
 		err = __map_osds(osdc, req);
 		if (err == 0)