]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: simplify OmapIteratorImpl::valid() 11964/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Tue, 15 Nov 2016 02:18:36 +0000 (10:18 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Tue, 15 Nov 2016 02:18:36 +0000 (10:18 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/os/bluestore/BlueStore.cc

index 4cfe67ba03aa8c9b390554594db526dbf7641331..d42ed6ce8b4a0e9aa7c274b35decdfa18fcaf9c5 100644 (file)
@@ -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)