diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index 4d7fabf813f..7e26d20d5f6 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -77,7 +77,7 @@ void ObjectCacher::Object::merge_left(BufferHead *left, BufferHead *right) dout(10) << "merge_left " << *left << " + " << *right << dendl; oc->bh_remove(this, right); oc->bh_stat_sub(left); - left->set_length( left->length() + right->length()); + left->set_length(left->length() + right->length()); oc->bh_stat_add(left); // data diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h index 44d8ccd80c1..fd90e2d4111 100644 --- a/src/osdc/ObjectCacher.h +++ b/src/osdc/ObjectCacher.h @@ -323,8 +323,12 @@ class ObjectCacher { void bh_stat_add(BufferHead *bh) { switch (bh->get_state()) { - case BufferHead::STATE_MISSING: stat_missing += bh->length(); break; - case BufferHead::STATE_CLEAN: stat_clean += bh->length(); break; + case BufferHead::STATE_MISSING: + stat_missing += bh->length(); + break; + case BufferHead::STATE_CLEAN: + stat_clean += bh->length(); + break; case BufferHead::STATE_DIRTY: stat_dirty += bh->length(); bh->ob->oset->dirty_tx += bh->length(); @@ -333,14 +337,20 @@ class ObjectCacher { stat_tx += bh->length(); bh->ob->oset->dirty_tx += bh->length(); break; - case BufferHead::STATE_RX: stat_rx += bh->length(); break; + case BufferHead::STATE_RX: + stat_rx += bh->length(); + break; } if (stat_waiter) stat_cond.Signal(); } void bh_stat_sub(BufferHead *bh) { switch (bh->get_state()) { - case BufferHead::STATE_MISSING: stat_missing -= bh->length(); break; - case BufferHead::STATE_CLEAN: stat_clean -= bh->length(); break; + case BufferHead::STATE_MISSING: + stat_missing -= bh->length(); + break; + case BufferHead::STATE_CLEAN: + stat_clean -= bh->length(); + break; case BufferHead::STATE_DIRTY: stat_dirty -= bh->length(); bh->ob->oset->dirty_tx -= bh->length(); @@ -349,7 +359,9 @@ class ObjectCacher { stat_tx -= bh->length(); bh->ob->oset->dirty_tx -= bh->length(); break; - case BufferHead::STATE_RX: stat_rx -= bh->length(); break; + case BufferHead::STATE_RX: + stat_rx -= bh->length(); + break; } } loff_t get_stat_tx() { return stat_tx; }