From ed40ea89f9ee9578e786f6e579bba77d537f7190 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Wed, 20 Feb 2013 21:59:33 -0600
Subject: [PATCH] --- yaml --- r: 359679 b: refs/heads/master c:
 4dda41d3d76747414586a4bad5615b550e0986b1 h: refs/heads/master i:   359677:
 132c73f08ed71ea1d5b983fba50f4894eaef68e0   359675:
 812297a0939b91f094750546ab6f8a08060fb80b   359671:
 ad31ed4e484337df9f49eb4352fc94aafb4ed3b5   359663:
 c1ace9beea66715084761bf155e0f694fa86397f   359647:
 3ddf936e885e6305da11f62da901e8d53cd0110e   359615:
 79f36e38c9232d8726151eb5f1653e73c1c80b2a   359551:
 3d992423f8f129c4d1548224d3f8a8eeb03f4e3b   359423:
 afe6e6d0034aeffacd487b0093c9937658635232 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/block/rbd.c | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 82d00dc43707..e99d0795059f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92a49fb0f79f3300e6e50ddf56238e70678e4202
+refs/heads/master: 4dda41d3d76747414586a4bad5615b550e0986b1
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index b0eea3eaee93..3cc003b26610 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -1560,6 +1560,7 @@ static int rbd_img_request_fill_bio(struct rbd_img_request *img_request,
 	image_offset = img_request->offset;
 	rbd_assert(image_offset == bio_list->bi_sector << SECTOR_SHIFT);
 	resid = img_request->length;
+	rbd_assert(resid > 0);
 	while (resid) {
 		const char *object_name;
 		unsigned int clone_size;
@@ -1627,8 +1628,10 @@ static void rbd_img_obj_callback(struct rbd_obj_request *obj_request)
 	bool more = true;
 
 	img_request = obj_request->img_request;
+
 	rbd_assert(img_request != NULL);
 	rbd_assert(img_request->rq != NULL);
+	rbd_assert(img_request->obj_request_count > 0);
 	rbd_assert(which != BAD_WHICH);
 	rbd_assert(which < img_request->obj_request_count);
 	rbd_assert(which >= img_request->next_completion);
@@ -1918,6 +1921,19 @@ static void rbd_request_fn(struct request_queue *q)
 		/* Ignore any non-FS requests that filter through. */
 
 		if (rq->cmd_type != REQ_TYPE_FS) {
+			dout("%s: non-fs request type %d\n", __func__,
+				(int) rq->cmd_type);
+			__blk_end_request_all(rq, 0);
+			continue;
+		}
+
+		/* Ignore/skip any zero-length requests */
+
+		offset = (u64) blk_rq_pos(rq) << SECTOR_SHIFT;
+		length = (u64) blk_rq_bytes(rq);
+
+		if (!length) {
+			dout("%s: zero-length request\n", __func__);
 			__blk_end_request_all(rq, 0);
 			continue;
 		}
@@ -1947,9 +1963,6 @@ static void rbd_request_fn(struct request_queue *q)
 			goto end_request;
 		}
 
-		offset = (u64) blk_rq_pos(rq) << SECTOR_SHIFT;
-		length = (u64) blk_rq_bytes(rq);
-
 		result = -EINVAL;
 		if (WARN_ON(offset && length > U64_MAX - offset + 1))
 			goto end_request;	/* Shouldn't happen */