From b2112576a74754dc3c493d3b53c27a5f56bf6302 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Wed, 27 Jul 2016 16:33:29 +0800 Subject: [PATCH] osd: drop redundant existence check of osd The is_up() check implicitly coveres the exist() check, so below here the exist() check is not necessary. Signed-off-by: xie xingguo --- src/osd/OSD.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index b94a3fd7a80..677caee0d29 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -6874,8 +6874,8 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m) osdmap->get_all_osds(old); for (set::iterator p = old.begin(); p != old.end(); ++p) { if (*p != whoami && - osdmap->have_inst(*p) && // in old map - (!newmap->exists(*p) || !newmap->is_up(*p))) { // but not the new one + osdmap->have_inst(*p) && // in old map + !newmap->is_up(*p)) { // but not the new one if (!waited_for_reservations) { service.await_reserved_maps(); waited_for_reservations = true; -- 2.47.3