From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 29 Jun 2016 08:53:26 +0000 (+0800)
Subject: os/bluestore: merge _rm_buffer() to reduce code redundancy
X-Git-Tag: v11.0.1~900^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f77d49e09c8cbb25a48037ab083904aaef89c0c2;p=ceph.git

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 52cb08f9d61a3..03f88ec2003be 100644
--- 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;
   }