os/bluestore: merge _rm_buffer() to reduce code redundancy

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 52cb08f9d61a3d07b8ea6ba1d108d91848989f3e..03f88ec2003beea4f7d03cd1aef9bac0ab31033a 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -882,11 +882,10 @@ int BlueStore::BufferSpace::_discard(uint64_t offset, uint64_t length)
       bufferlist bl;
       bl.substr_of(b->data, b->length - keep, keep);
       _add_buffer(new Buffer(this, b->state, b->seq, end, bl), 0, b);
-      _rm_buffer(i);
     } else {
       _add_buffer(new Buffer(this, b->state, b->seq, end, keep), 0, b);
-      _rm_buffer(i);
     }
+    _rm_buffer(i);
     cache->_audit("discard end 2");
     break;
   }