3.7-stable review patch. If anyone has any objections, please let me know.
------------------ From: Alex Elder <[email protected]> (cherry picked from commit a0ea3a40fd20b8c66381f747c454f89d6d1f50d4) When rbd_dev_probe() calls rbd_dev_image_id() it expects to get a 0 return code if successful, but it is getting a positive value. The reason is that rbd_dev_image_id() returns the value it gets from rbd_req_sync_exec(), which returns the number of bytes read in as a result of the request. (This ultimately comes from ceph_copy_from_page_vector() in rbd_req_sync_op()). Force the return value to 0 when successful in rbd_dev_image_id(). Do the same in rbd_dev_v2_object_prefix(). Signed-off-by: Alex Elder <[email protected]> Reviewed-by: Josh Durgin <[email protected]> Reviewed-by: Dan Mick <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/block/rbd.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2189,6 +2189,7 @@ static int rbd_dev_v2_object_prefix(stru 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, @@ -2841,6 +2842,7 @@ static int rbd_dev_image_id(struct rbd_d 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, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
