From: Sage Weil <sage@newdream.net>
Date: Wed, 1 Dec 2010 17:51:27 +0000 (-0800)
Subject: rbd: use MIN instead of min()
X-Git-Tag: v0.24~82
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cbb562089c788e5eeb8cbee7a2be5de0b40d84b4;p=ceph.git

rbd: use MIN instead of min()

Not even sure where min() was coming from, but it seems to be missing on
i386 lucid.:

g++ -DHAVE_CONFIG_H -I.     -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -rdynamic -g -O2 -MT rbd.o -MD -MP -MF .deps/rbd.Tpo -c -o rbd.o rbd.cc
rbd.cc: In function 'int do_import(void*, const char*, int, const char*)':
rbd.cc:837: error: no matching function for call to 'min(uint64_t&, off_t)'
make[3]: *** [rbd.o] Error 1

Reported-by: John Leach <john@johnleach.co.uk>
Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/rbd.cc b/src/rbd.cc
index fe4797f250f24..a6dcb7d7f51d6 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -20,6 +20,7 @@
 using namespace librados;
 #include "include/byteorder.h"
 
+#include "include/intarith.h"
 
 #include <errno.h>
 #include <inttypes.h>
@@ -834,7 +835,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(size, file_pos + extent_len);
 
       end_block = get_block_num(&header, end_ofs - 1); /* ending block */