From: Kefu Chai <kchai@redhat.com>
Date: Wed, 13 Jan 2021 09:24:09 +0000 (+0800)
Subject: Merge pull request #33692 from majianpeng/osd-remove-useless-code
X-Git-Tag: v17.0.0~93
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=51f86c9d13404531e2986e7b6402c23b159d9dcf;p=ceph-ci.git

Merge pull request #33692 from majianpeng/osd-remove-useless-code

osd: remove usless check condition.

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

51f86c9d13404531e2986e7b6402c23b159d9dcf
diff --cc src/osd/OSD.h
index 30e60cee184,d62b2aa7cbe..90d2f800fb8
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@@ -199,11 -206,9 +199,9 @@@ public
    /// gets ref to next_osdmap and registers the epoch as reserved
    OSDMapRef get_nextmap_reserved() {
      std::lock_guard l(pre_publish_lock);
-     if (!next_osdmap)
-       return OSDMapRef();
      epoch_t e = next_osdmap->get_epoch();
 -    map<epoch_t, unsigned>::iterator i =
 -      map_reservations.insert(make_pair(e, 0)).first;
 +    std::map<epoch_t, unsigned>::iterator i =
 +      map_reservations.insert(std::make_pair(e, 0)).first;
      i->second++;
      return next_osdmap;
    }