diff options
| author | Alex Elder <elder@inktank.com> | 2012-10-10 21:19:13 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 08:46:49 -0800 |
| commit | 2042c7c78b7819daff3033ef4868c8dc7fc34a09 (patch) | |
| tree | 409fbc0b97ac4a45b7f04311ce34fa15a26953d6 | |
| parent | 38f14fd492d3a7d2d096795f2e457d556a6b2f95 (diff) | |
| download | lwn-2042c7c78b7819daff3033ef4868c8dc7fc34a09.tar.gz lwn-2042c7c78b7819daff3033ef4868c8dc7fc34a09.zip | |
rbd: zero return code in rbd_dev_image_id()
(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 <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/block/rbd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 37d928f573e4..88e5dbe10633 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2189,6 +2189,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, @@ -2841,6 +2842,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, |