From: Sage Weil <sage@inktank.com>
Date: Sat, 29 Sep 2012 08:22:19 +0000 (-0700)
Subject: librbd: simplify math
X-Git-Tag: v0.53~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c10932924453f8e4d9669e84b5d4305be911e19e;p=ceph.git

librbd: simplify math

Bending over backwards hasn't made coverity happy.  We'll just ignore it
there.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit c517fde2691f974693ce581f8e215512194e79d3)
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 9176ec9198f..e664b351047 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -141,9 +141,7 @@ namespace librbd {
     iss.ignore(object_prefix.length() + 1);
     uint64_t num, offset;
     iss >> std::hex >> num;
-    uint64_t block_size = 1ULL << order;
-    assert(num > (ULLONG_MAX / block_size));
-    offset = num * block_size;
+    offset = num * (1ULL << order);
     return offset;
   }