提交 a0ea3a40 编写于 作者: A Alex Elder

rbd: zero return code in rbd_dev_image_id()

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: NAlex Elder <elder@inktank.com>
Reviewed-by: NJosh Durgin <josh.durgin@inktank.com>
Reviewed-by: NDan Mick <dan.mick@inktank.com>
上级 b213e0b1
...@@ -2207,6 +2207,7 @@ static int rbd_dev_v2_object_prefix(struct rbd_device *rbd_dev) ...@@ -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); dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret);
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = 0; /* rbd_req_sync_exec() can return positive */
p = reply_buf; p = reply_buf;
rbd_dev->header.object_prefix = ceph_extract_encoded_string(&p, 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) ...@@ -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); dout("%s: rbd_req_sync_exec returned %d\n", __func__, ret);
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = 0; /* rbd_req_sync_exec() can return positive */
p = response; p = response;
rbd_dev->image_id = ceph_extract_encoded_string(&p, rbd_dev->image_id = ceph_extract_encoded_string(&p,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册