From 5884850fa86cdb24d52644592e64e45f1ce4825e Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Tue, 15 Nov 2016 10:18:36 +0800 Subject: [PATCH] os/bluestore: simplify OmapIteratorImpl::valid() Signed-off-by: xie xingguo --- src/os/bluestore/BlueStore.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 4cfe67ba03a..d42ed6ce8b4 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) -- 2.39.5