| Message ID | 50ABE062.6000401@inktank.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 37b39c1..b2e819c 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1262,13 +1262,6 @@ static int rbd_req_sync_op(struct rbd_device *rbd_dev, if (IS_ERR(pages)) return PTR_ERR(pages); - if (op->op == CEPH_OSD_OP_READ || op->op == CEPH_OSD_OP_WRITE) { - op->extent.offset = ofs; - op->extent.length = inbound_size; - if (op->op == CEPH_OSD_OP_WRITE) - op->payload_len = inbound_size; - } - ret = rbd_do_request(NULL, rbd_dev, NULL, CEPH_NOSNAP, object_name, ofs, inbound_size, NULL,
Move the assignment of the extent offset and length and payload length out of rbd_req_sync_op() and into its caller in the one spot where a read (and note--no write) operation might be initiated. Signed-off-by: Alex Elder <elder@inktank.com> --- drivers/block/rbd.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) pages, num_pages, @@ -1373,6 +1366,9 @@ static int rbd_req_sync_read(struct rbd_device *rbd_dev, op = rbd_create_rw_op(CEPH_OSD_OP_READ, 0); if (!op) return -ENOMEM; + op->extent.offset = ofs; + op->extent.length = len; + op->payload_len = 0; ret = rbd_req_sync_op(rbd_dev, CEPH_OSD_FLAG_READ, op, object_name, ofs, len, buf, NULL, ver);