osd/osd_types: reset payload_len in merge_osd_op_vector_out_data

This is cleaner and simpler.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h
index 657f7403635860c973b681a889bbd12e2fcf9b3a..c5ada193dcb1e84770e600f67b76d5348becd1ff 100644 (file)
--- 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 69e8157a92349c5a4da48d1c8750dc12327074de..cd7014757b96bda4ff90a6edc936817f0b4b1867 100644 (file)
--- 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<OSDOp>& ops, ceph::buffer::list&
 void OSDOp::merge_osd_op_vector_out_data(vector<OSDOp>& 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);
     }
   }