]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "osdc: Fix compiler warning"
authorSage Weil <sage@redhat.com>
Fri, 24 Oct 2014 18:19:15 +0000 (11:19 -0700)
committerSage Weil <sage@redhat.com>
Fri, 24 Oct 2014 18:19:15 +0000 (11:19 -0700)
This reverts commit cb290a117ae17961c9e43e5fe76bb3edb2ed7efa.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osdc/ObjectCacher.h

index 08bc53b0cd1d11120f70697f733fbcb34a49f0f6..f49a264d664f6985664b0df6708505c2f0d8deec 100644 (file)
@@ -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;
     }
   };