]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #33692 from majianpeng/osd-remove-useless-code
authorKefu Chai <kchai@redhat.com>
Wed, 13 Jan 2021 09:24:09 +0000 (17:24 +0800)
committerGitHub <noreply@github.com>
Wed, 13 Jan 2021 09:24:09 +0000 (17:24 +0800)
osd: remove usless check condition.

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/OSD.h

diff --cc src/osd/OSD.h
index 30e60cee184c463e4b2dfb96f0abe320ab6becbb,d62b2aa7cbe3263613d08f4cc7843bc5936c7ce2..90d2f800fb841a96236ca4c06d0e46493ddd70a8
@@@ -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;
    }