From 2027eb2584af5a8fec8b335df43ac1e3815aa7a8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 24 Sep 2019 14:28:01 -0500 Subject: [PATCH] osd/osd_types: reset payload_len in merge_osd_op_vector_out_data This is cleaner and simpler. Signed-off-by: Sage Weil --- src/messages/MOSDOpReply.h | 1 - src/osd/osd_types.cc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h index 657f740363586..c5ada193dcb1e 100644 --- a/src/messages/MOSDOpReply.h +++ b/src/messages/MOSDOpReply.h @@ -147,7 +147,6 @@ public: // zero out ops payload_len and possibly out data for (unsigned i = 0; i < ops.size(); i++) { - ops[i].op.payload_len = 0; if (ignore_out_data && (ceph_osd_op_mode_modify(ops[i].op.op) || ceph_osd_op_mode_cache(ops[i].op.op))) { diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 69e8157a92349..cd7014757b96b 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -6716,8 +6716,8 @@ void OSDOp::split_osd_op_vector_out_data(vector& ops, ceph::buffer::list& void OSDOp::merge_osd_op_vector_out_data(vector& ops, ceph::buffer::list& out) { for (unsigned i = 0; i < ops.size(); i++) { + ops[i].op.payload_len = ops[i].outdata.length(); if (ops[i].outdata.length()) { - ops[i].op.payload_len = ops[i].outdata.length(); out.append(ops[i].outdata); } } -- 2.39.5