From: Jos Collin <jcollin@redhat.com>
Date: Fri, 14 Jul 2017 02:13:51 +0000 (+0530)
Subject: crush: silence warning from -Woverflow
X-Git-Tag: v12.1.1~10^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16329%2Fhead;p=ceph.git

crush: silence warning from -Woverflow

The following warning appears during build:
ceph/src/crush/CrushWrapper.cc: In member function ‘int32_t CrushWrapper::_alloc_class_id() const’:
ceph/src/crush/CrushWrapper.cc:1322:56: warning: integer overflow in expression [-Woverflow]
   uint32_t upperlimit = numeric_limits<int32_t>::max() + 1;
                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~

Signed-off-by: Jos Collin <jcollin@redhat.com>
---

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 3bdc7d73c31..fdcace16d0b 100644
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -1319,7 +1319,8 @@ int32_t CrushWrapper::_alloc_class_id() const {
     return class_id;
   }
   // wrapped, pick a random start and do exhaustive search
-  uint32_t upperlimit = numeric_limits<int32_t>::max() + 1;
+  uint32_t upperlimit = numeric_limits<int32_t>::max();
+  upperlimit++;
   class_id = rand() % upperlimit;
   const auto start = class_id;
   do {