From 5c382d358244e060d93a858acc87627215a6aa30 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 11 May 2011 17:47:50 -0700 Subject: [PATCH] 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 --- src/osdc/Objecter.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index b889212c2411d..4f28eab700733 100644 --- 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; } } -- 2.39.5