---

yaml --- r: 347565 b: refs/heads/master c: a0ea3a4 h: refs/heads/master i: 347563: 298ea98 v: v3
git-mirror · Oct 26, 2012 · 017288e · 017288e
1 parent 85d2082
commit 017288e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b213e0b1a62637b2a9395a34349b13d73ca2b90a
+refs/heads/master: a0ea3a40fd20b8c66381f747c454f89d6d1f50d4
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
@@ -2207,6 +2207,7 @@ static int rbd_dev_v2_object_prefix(struct rbd_device *rbd_dev)
 	dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret);
 	if (ret < 0)
 		goto out;
+	ret = 0;    /* rbd_req_sync_exec() can return positive */
 
 	p = reply_buf;
 	rbd_dev->header.object_prefix = ceph_extract_encoded_string(&p,
@@ -2900,6 +2901,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)
 	dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret);
 	if (ret < 0)
 		goto out;
+	ret = 0;    /* rbd_req_sync_exec() can return positive */
 
 	p = response;
 	rbd_dev->image_id = ceph_extract_encoded_string(&p,