From 02b46cf5791ad8233563f8793ab3d0d1c27c1405 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@dreamhost.com>
Date: Thu, 8 Nov 2012 08:01:39 -0600
Subject: [PATCH] --- yaml --- r: 359577 b: refs/heads/master c:
 cd323ac0eb433b14cbb270bfc5a82f308f2662de h: refs/heads/master i:   359575:
 f51d92cbbe4511fe7de670597537f72aefe1021f v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/block/rbd.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d7ff4fb0d894..023b80cef452 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8295cda7ceceb7b25f9a12cd21bbfb6206e28a6d
+refs/heads/master: cd323ac0eb433b14cbb270bfc5a82f308f2662de
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index 738d1e4c0ab5..21468d0b2792 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -1126,12 +1126,8 @@ static int rbd_do_request(struct request *rq,
 	struct ceph_osd_client *osdc;
 
 	rbd_req = kzalloc(sizeof(*rbd_req), GFP_NOIO);
-	if (!rbd_req) {
-		if (coll)
-			rbd_coll_end_req_index(rq, coll, coll_index,
-					       (s32)-ENOMEM, len);
+	if (!rbd_req)
 		return -ENOMEM;
-	}
 
 	if (coll) {
 		rbd_req->coll = coll;
@@ -1206,7 +1202,6 @@ static int rbd_do_request(struct request *rq,
 	bio_chain_put(rbd_req->bio);
 	ceph_osdc_put_request(osd_req);
 done_pages:
-	rbd_coll_end_req(rbd_req, (s32)ret, len);
 	kfree(rbd_req);
 	return ret;
 }
@@ -1359,7 +1354,9 @@ static int rbd_do_op(struct request *rq,
 			     ops,
 			     coll, coll_index,
 			     rbd_req_cb, 0, NULL);
-
+	if (ret < 0)
+		rbd_coll_end_req_index(rq, coll, coll_index,
+					(s32)ret, seg_len);
 	rbd_destroy_ops(ops);
 done:
 	kfree(seg_name);