From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 10 May 2017 11:01:49 +0000 (+0800)
Subject: os/bluestore: pre-calculate number of ghost buffers to evict
X-Git-Tag: v12.0.3~22^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=27e546a32fbb2b20c1cc820e53ba64a061c6f64c;p=ceph.git

os/bluestore: pre-calculate number of ghost buffers to evict

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 ee8a5042d539..8197cbad759f 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -1134,7 +1134,8 @@ void BlueStore::TwoQCache::_trim(uint64_t onode_max, uint64_t buffer_max)
     }
 
     // adjust warm out list too, if necessary
-    while (buffer_warm_out.size() > kout) {
+    int64_t num = buffer_warm_out.size() - kout;
+    while (num-- > 0) {
       Buffer *b = &*buffer_warm_out.rbegin();
       assert(b->is_empty());
       dout(20) << __func__ << " buffer_warm_out rm " << *b << dendl;