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>

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 35c8b006916f..c6d1d603bacf 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -78,6 +78,9 @@ struct ceph_osd_req_op {
         u16 op;           /* CEPH_OSD_OP_* */
         u32 flags;        /* CEPH_OSD_OP_FLAG_* */
         u32 indata_len;   /* request */
+        u32 outdata_len;  /* reply */
+        s32 rval;
+
         union {
                 struct ceph_osd_data raw_data_in;
                 struct {
@@ -148,8 +151,6 @@ struct ceph_osd_request {
         struct ceph_eversion *r_request_reassert_version;
 
         int               r_result;
-        int               r_reply_op_len[CEPH_OSD_MAX_OP];
-        s32               r_reply_op_result[CEPH_OSD_MAX_OP];
         int               r_got_reply;
         int               r_linger;