diff options
-rw-r--r-- | include/linux/ceph/osd_client.h | 1 | ||||
-rw-r--r-- | include/linux/ceph/rados.h | 2 | ||||
-rw-r--r-- | net/ceph/osd_client.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index fd47e872ebcc..e94f5da251d6 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h | |||
@@ -76,6 +76,7 @@ struct ceph_osd_data { | |||
76 | 76 | ||
77 | struct ceph_osd_req_op { | 77 | struct ceph_osd_req_op { |
78 | u16 op; /* CEPH_OSD_OP_* */ | 78 | u16 op; /* CEPH_OSD_OP_* */ |
79 | u32 flags; /* CEPH_OSD_OP_FLAG_* */ | ||
79 | u32 payload_len; | 80 | u32 payload_len; |
80 | union { | 81 | union { |
81 | struct ceph_osd_data raw_data_in; | 82 | struct ceph_osd_data raw_data_in; |
diff --git a/include/linux/ceph/rados.h b/include/linux/ceph/rados.h index 96292df4041b..8f9bf4570215 100644 --- a/include/linux/ceph/rados.h +++ b/include/linux/ceph/rados.h | |||
@@ -382,7 +382,7 @@ enum { | |||
382 | */ | 382 | */ |
383 | struct ceph_osd_op { | 383 | struct ceph_osd_op { |
384 | __le16 op; /* CEPH_OSD_OP_* */ | 384 | __le16 op; /* CEPH_OSD_OP_* */ |
385 | __le32 flags; /* CEPH_OSD_FLAG_* */ | 385 | __le32 flags; /* CEPH_OSD_OP_FLAG_* */ |
386 | union { | 386 | union { |
387 | struct { | 387 | struct { |
388 | __le64 offset, length; | 388 | __le64 offset, length; |
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 0676f2b199d6..5d7fd0b8c1c8 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
@@ -688,7 +688,9 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req, | |||
688 | 688 | ||
689 | return 0; | 689 | return 0; |
690 | } | 690 | } |
691 | |||
691 | dst->op = cpu_to_le16(src->op); | 692 | dst->op = cpu_to_le16(src->op); |
693 | dst->flags = cpu_to_le32(src->flags); | ||
692 | dst->payload_len = cpu_to_le32(src->payload_len); | 694 | dst->payload_len = cpu_to_le32(src->payload_len); |
693 | 695 | ||
694 | return request_data_len; | 696 | return request_data_len; |