1 files changed, 10 insertions, 5 deletions

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 7506b485bb6d..4343df806710 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -43,7 +43,8 @@ struct ceph_osd {
 };
 
 
-#define CEPH_OSD_MAX_OP 3
+#define CEPH_OSD_SLAB_OPS       2
+#define CEPH_OSD_MAX_OPS        16
 
 enum ceph_osd_data_type {
         CEPH_OSD_DATA_TYPE_NONE = 0,
@@ -77,7 +78,10 @@ struct ceph_osd_data {
 struct ceph_osd_req_op {
         u16 op;           /* CEPH_OSD_OP_* */
         u32 flags;        /* CEPH_OSD_OP_FLAG_* */
-        u32 payload_len;
+        u32 indata_len;   /* request */
+        u32 outdata_len;  /* reply */
+        s32 rval;
+
         union {
                 struct ceph_osd_data raw_data_in;
                 struct {
@@ -136,7 +140,6 @@ struct ceph_osd_request {
 
         /* request osd ops array  */
         unsigned int            r_num_ops;
-        struct ceph_osd_req_op  r_ops[CEPH_OSD_MAX_OP];
 
         /* these are updated on each send */
         __le32           *r_request_osdmap_epoch;
@@ -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;
 
@@ -174,6 +175,8 @@ struct ceph_osd_request {
         unsigned long     r_stamp;            /* send OR check time */
 
         struct ceph_snap_context *r_snapc;    /* snap context for writes */
+
+        struct ceph_osd_req_op r_ops[];
 };
 
 struct ceph_request_redirect {
@@ -263,6 +266,8 @@ extern void osd_req_op_extent_init(struct ceph_osd_request *osd_req,
                                         u64 truncate_size, u32 truncate_seq);
 extern void osd_req_op_extent_update(struct ceph_osd_request *osd_req,
                                         unsigned int which, u64 length);
+extern void osd_req_op_extent_dup_last(struct ceph_osd_request *osd_req,
+                                       unsigned int which, u64 offset_inc);
 
 extern struct ceph_osd_data *osd_req_op_extent_osd_data(
                                         struct ceph_osd_request *osd_req,