From: Sage Weil <sage.weil@dreamhost.com>
Date: Thu, 10 Feb 2011 17:01:09 +0000 (-0800)
Subject: rbd: fix signed/unsigned comp on i386
X-Git-Tag: v0.25~175
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=500edf7a81c8b46ec1f1cdadb8b60dbbb4510727;p=ceph.git

rbd: fix signed/unsigned comp on i386

We -D_FILE_OFFSET_BITS=64, so off_t is off64_t.

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

diff --git a/src/rbd.cc b/src/rbd.cc
index 964ca7a210f3..fd3cf832f5b8 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -861,7 +861,7 @@ static int do_import(pool_t pool, const char *imgname, int order, const char *pa
         break; /* don't try to merge if we're big enough */
 
       extent_len += fiemap->fm_extents[extent].fe_length;  /* length of current extent */
-      end_ofs = MIN(size, file_pos + extent_len);
+      end_ofs = MIN((off_t)size, file_pos + (off_t)extent_len);
 
       end_block = get_block_num(&header, end_ofs - 1); /* ending block */