From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 15 Nov 2016 02:18:36 +0000 (+0800)
Subject: os/bluestore: simplify OmapIteratorImpl::valid()
X-Git-Tag: v11.1.0~288^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5884850fa86cdb24d52644592e64e45f1ce4825e;p=ceph.git

os/bluestore: simplify OmapIteratorImpl::valid()

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 4cfe67ba03aa..d42ed6ce8b4a 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -5778,11 +5778,7 @@ int BlueStore::OmapIteratorImpl::lower_bound(const string& to)
 bool BlueStore::OmapIteratorImpl::valid()
 {
   RWLock::RLocker l(c->lock);
-  if (o->onode.omap_head && it->valid() && it->raw_key().second <= tail) {
-    return true;
-  } else {
-    return false;
-  }
+  return o->onode.omap_head && it->valid() && it->raw_key().second <= tail;
 }
 
 int BlueStore::OmapIteratorImpl::next(bool validate)