From: Sage Weil <sage@newdream.net>
Date: Mon, 14 Mar 2011 16:26:14 +0000 (-0700)
Subject: librbd: uint64_t for image sizes
X-Git-Tag: v0.25.1~12
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fe917607721c43c4bf17a5b09e11ae5519e6db36;p=ceph.git

librbd: uint64_t for image sizes

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---

diff --git a/src/include/rbd/librbd.h b/src/include/rbd/librbd.h
index 56fa311e2841e..5cf7a2b6cd449 100644
--- a/src/include/rbd/librbd.h
+++ b/src/include/rbd/librbd.h
@@ -60,14 +60,14 @@ void rbd_version(int *major, int *minor, int *extra);
 
 /* images */
 int rbd_list(rados_ioctx_t io, char *names, size_t *size);
-int rbd_create(rados_ioctx_t io, const char *name, size_t size, int *order);
+int rbd_create(rados_ioctx_t io, const char *name, uint64_t size, int *order);
 int rbd_remove(rados_ioctx_t io, const char *name);
 int rbd_copy(rados_ioctx_t src_io_ctx, const char *srcname, rados_ioctx_t dest_io_ctx, const char *destname);
 int rbd_rename(rados_ioctx_t src_io_ctx, const char *srcname, const char *destname);
 
 int rbd_open(rados_ioctx_t io, const char *name, rbd_image_t *image, const char *snap_name);
 int rbd_close(rbd_image_t image);
-int rbd_resize(rbd_image_t image, size_t size);
+int rbd_resize(rbd_image_t image, uint64_t size);
 int rbd_stat(rbd_image_t image, rbd_image_info_t *info, size_t infosize);
 
 /* snapshots */
diff --git a/src/include/rbd/librbd.hpp b/src/include/rbd/librbd.hpp
index 6b557baddc31e..d6c4d2b1b9dbb 100644
--- a/src/include/rbd/librbd.hpp
+++ b/src/include/rbd/librbd.hpp
@@ -60,7 +60,7 @@ public:
   int open(IoCtx& io_ctx, Image& image, const char *name);
   int open(IoCtx& io_ctx, Image& image, const char *name, const char *snapname);
   int list(IoCtx& io_ctx, std::vector<std::string>& names);
-  int create(IoCtx& io_ctx, const char *name, size_t size, int *order);
+  int create(IoCtx& io_ctx, const char *name, uint64_t size, int *order);
   int remove(IoCtx& io_ctx, const char *name);
   int copy(IoCtx& src_io_ctx, const char *srcname, IoCtx& dest_io_ctx, const char *destname);
   int rename(IoCtx& src_io_ctx, const char *srcname, const char *destname);
@@ -77,7 +77,7 @@ public:
   Image();
   ~Image();
 
-  int resize(size_t size);
+  int resize(uint64_t size);
   int stat(image_info_t &info, size_t infosize);
 
   /* snapshots */
diff --git a/src/librbd.cc b/src/librbd.cc
index 7f57d25c10545..5e95a93f1253b 100644
--- a/src/librbd.cc
+++ b/src/librbd.cc
@@ -246,7 +246,7 @@ namespace librbd {
   uint64_t get_block_ofs(rbd_obj_header_ondisk *header, uint64_t ofs);
   int init_rbd_info(struct rbd_info *info);
   void init_rbd_header(struct rbd_obj_header_ondisk& ondisk,
-			      size_t size, int *order, uint64_t bid);
+			      uint64_t size, int *order, uint64_t bid);
 
   int read_iterate(ImageCtx *ictx, off_t off, size_t len,
                    int (*cb)(off_t, size_t, const char *, void *),
@@ -285,7 +285,7 @@ void WatchCtx::notify(uint8_t opcode, uint64_t ver)
 }
 
 void init_rbd_header(struct rbd_obj_header_ondisk& ondisk,
-					size_t size, int *order, uint64_t bid)
+					uint64_t size, int *order, uint64_t bid)
 {
   uint32_t hi = bid >> 32;
   uint32_t lo = bid & 0xFFFFFFFF;
diff --git a/src/rbd.cc b/src/rbd.cc
index 5fd428bffe2b7..a5eb473be4016 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -112,7 +112,7 @@ static int do_list(librbd::RBD &rbd, librados::IoCtx& io_ctx)
 }
 
 static int do_create(librbd::RBD &rbd, librados::IoCtx& io_ctx,
-		     const char *imgname, size_t size, int *order)
+		     const char *imgname, uint64_t size, int *order)
 {
   int r = rbd.create(io_ctx, imgname, size, order);
   if (r < 0)
@@ -149,7 +149,7 @@ static int do_show_info(const char *imgname, librbd::Image& image)
   return 0;
 }
 
-static int do_resize(librbd::Image& image, size_t size)
+static int do_resize(librbd::Image& image, uint64_t size)
 {
   int r = image.resize(size);
   if (r < 0)