objecter: fix calc_op_budget bit mask checks

Use the helpers; we need to mask out several bits and compare.

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

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index b889212c2411dd8eb6821f624a606e5a44521b38..4f28eab700733a8eb778437125016ef979689ea6 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -683,10 +683,10 @@ int Objecter::calc_op_budget(Op *op)
     if (i->op.op & CEPH_OSD_OP_MODE_WR) {
       op_budget += i->data.length();
     } else if (i->op.op & CEPH_OSD_OP_MODE_RD) {
-      if (i->op.op & CEPH_OSD_OP_TYPE_DATA) {
+      if (ceph_osd_op_type_data(i->op.op)) {
         if ((int64_t)i->op.extent.length > 0)
          op_budget += (int64_t)i->op.extent.length;
-      } else if (i->op.op & CEPH_OSD_OP_TYPE_ATTR) {
+      } else if (ceph_osd_op_type_attr(i->op.op)) {
         op_budget += i->op.xattr.name_len + i->op.xattr.value_len;
       }
     }