messages: fix test for multi op

diff --git a/src/include/rados.h b/src/include/rados.h
index 26c4f78fa9902d8ea5d8d79474aea7eec4baead7..895e0573ae1b85254415f306b65c067d82cc0bd4 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -284,6 +284,10 @@ static inline int ceph_osd_op_type_pg(int op)
 {
        return (op & CEPH_OSD_OP_TYPE) == CEPH_OSD_OP_TYPE_PG;
 }
+static inline int ceph_osd_op_type_multi(int op)
+{
+       return (op & CEPH_OSD_OP_TYPE) == CEPH_OSD_OP_TYPE_MULTI;
+}
 
 static inline int ceph_osd_op_mode_subop(int op)
 {

diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h
index 3ad735dd6f697d16e6ef1e72e1b60996870b235a..ea3278be2e93ba0c44eb3c4f1d904644b8cfd45b 100644 (file)
--- a/src/messages/MOSDOp.h
+++ b/src/messages/MOSDOp.h
@@ -173,7 +173,7 @@ public:
   virtual void encode_payload() {
 
     for (unsigned i = 0; i < ops.size(); i++) {
-      if (ops[i].op.op & CEPH_OSD_OP_TYPE_MULTI) {
+      if (ceph_osd_op_type_multi(ops[i].op.op)) {
        ops[i].op.payload_len = ops[i].oid.name.length();
        data.append(ops[i].oid.name);
       } else {