From: Sage Weil <sage@redhat.com>
Date: Fri, 24 Oct 2014 18:19:15 +0000 (-0700)
Subject: Revert "osdc: Fix compiler warning"
X-Git-Tag: v0.88~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2cebe5b6d7155a38c90e8614e9980adc688334b;p=ceph.git

Revert "osdc: Fix compiler warning"

This reverts commit cb290a117ae17961c9e43e5fe76bb3edb2ed7efa.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h
index 08bc53b0cd1d..f49a264d664f 100644
--- a/src/osdc/ObjectCacher.h
+++ b/src/osdc/ObjectCacher.h
@@ -166,10 +166,8 @@ class ObjectCacher {
 
     //! Returns the size of the overlap between the BufferHead's range and the given range.
     uint64_t overlap_size(uint64_t start, uint64_t end) {
-      assert(ex.start >= 0);
-      assert(ex.length >= 0);
-      uint64_t overlap_start = MAX(start, (uint64_t)ex.start);
-      uint64_t overlap_end = MIN(end, (uint64_t)(ex.start + ex.length));
+      uint64_t overlap_start = MAX(start, ex.start);
+      uint64_t overlap_end = MIN(end, ex.start + ex.length);
       return overlap_end - overlap_start;
     }
   };