summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorYan, Zheng <zyan@redhat.com>2016-01-07 09:48:57 +0100
committerIlya Dryomov <idryomov@gmail.com>2016-03-25 18:51:42 +0100
commit7665d85b7307fa0218881bc2009de067c42dc52e (patch)
treea516a404d8a70f0730d6973dc9290f250a4adbf5 /drivers/block
parentlibceph: rename ceph_osd_req_op::payload_len to indata_len (diff)
downloadlinux-7665d85b7307fa0218881bc2009de067c42dc52e.tar.xz
linux-7665d85b7307fa0218881bc2009de067c42dc52e.zip
libceph: move r_reply_op_{len,result} into struct ceph_osd_req_op
This avoids defining large array of r_reply_op_{len,result} in in struct ceph_osd_request. Signed-off-by: Yan, Zheng <zyan@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 4a876785b68c..94f31bde73e8 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1854,7 +1854,7 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req,
* passed to the block layer, which just supports a 32-bit
* length field.
*/
- obj_request->xferred = osd_req->r_reply_op_len[0];
+ obj_request->xferred = osd_req->r_ops[0].outdata_len;
rbd_assert(obj_request->xferred < (u64)UINT_MAX);
opcode = osd_req->r_ops[0].op;