librados: fixup rados_trunc

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

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index 18726b753d0e2ac11485df0b6757695b78cf15e0..e30189ae28e23f69d77bf967a8daf01551a498c4 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -144,7 +144,7 @@ int rados_write(rados_ioctx_t io, const char *oid, const char *buf, size_t len,
 int rados_write_full(rados_ioctx_t io, const char *oid, const char *buf, size_t len, uint64_t off);
 int rados_read(rados_ioctx_t io, const char *oid, char *buf, size_t len, uint64_t off);
 int rados_remove(rados_ioctx_t io, const char *oid);
-int rados_trunc(rados_ioctx_t io, const char *oid, size_t size);
+int rados_trunc(rados_ioctx_t io, const char *oid, uint64_t size);
 
 /* attrs */
 int rados_getxattr(rados_ioctx_t io, const char *o, const char *name, char *buf, size_t len);

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index dd875b708983a21ebaccaa1553830b51cb0b343d..620070a1116812b432f5b280725900cb18c38264 100644 (file)
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -121,7 +121,7 @@ namespace librados
     int write_full(const std::string& oid, bufferlist& bl);
     int read(const std::string& oid, bufferlist& bl, size_t len, uint64_t off);
     int remove(const std::string& oid);
-    int trunc(const std::string& oid, size_t size);
+    int trunc(const std::string& oid, uint64_t size);
     int mapext(const std::string& o, uint64_t off, size_t len, std::map<uint64_t, size_t>& m);
     int sparse_read(const std::string& o, std::map<uint64_t, size_t>& m, bufferlist& bl, size_t len, uint64_t off);
     int getxattr(const std::string& oid, const char *name, bufferlist& bl);

diff --git a/src/librados.cc b/src/librados.cc
index 8800920213194784599d2d889d786297a4e93322..c71a1cce1a7cd1f9810bfef6ff3b2883fa0baf2d 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -311,7 +311,7 @@ public:
                  size_t len, uint64_t off);
   int remove(IoCtxImpl& io, const object_t& oid);
   int stat(IoCtxImpl& io, const object_t& oid, uint64_t *psize, time_t *pmtime);
-  int trunc(IoCtxImpl& io, const object_t& oid, size_t size);
+  int trunc(IoCtxImpl& io, const object_t& oid, uint64_t size);
 
   int tmap_update(IoCtxImpl& io, const object_t& oid, bufferlist& cmdbl);
   int exec(IoCtxImpl& io, const object_t& oid, const char *cls, const char *method, bufferlist& inbl, bufferlist& outbl);
@@ -1265,7 +1265,7 @@ remove(IoCtxImpl& io, const object_t& oid)
 }
 
 int librados::RadosClient::
-trunc(IoCtxImpl& io, const object_t& oid, size_t size)
+trunc(IoCtxImpl& io, const object_t& oid, uint64_t size)
 {
   utime_t ut = g_clock.now();
 
@@ -2084,7 +2084,7 @@ remove(const std::string& oid)
 }
 
 int librados::IoCtx::
-trunc(const std::string& oid, size_t size)
+trunc(const std::string& oid, uint64_t size)
 {
   object_t obj(oid);
   return io_ctx_impl->client->trunc(*io_ctx_impl, obj, size);
@@ -2728,7 +2728,7 @@ extern "C" int rados_write(rados_ioctx_t io, const char *o, const char *buf, siz
   return ctx->client->write(*ctx, oid, bl, len, off);
 }
 
-extern "C" int rados_write_full(rados_ioctx_t io, const char *o, const char *buf, size_t len, off_t off)
+extern "C" int rados_write_full(rados_ioctx_t io, const char *o, const char *buf, size_t len, uint64_t off)
 {
   librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io;
   object_t oid(o);
@@ -2737,7 +2737,7 @@ extern "C" int rados_write_full(rados_ioctx_t io, const char *o, const char *buf
   return ctx->client->write_full(*ctx, oid, bl);
 }
 
-extern "C" int rados_trunc(rados_ioctx_t io, const char *o, size_t size)
+extern "C" int rados_trunc(rados_ioctx_t io, const char *o, uint64_t size)
 {
   librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io;
   object_t oid(o);