librados:rados_ioctx_stat -> rados_ioctx_pool_stat

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

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index d7ff1a8a202791620a7ac3aa1e9156576ca62ace..2468a7971af2638e410c850f12640eb02973f158 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -30,7 +30,7 @@ typedef void *rados_ioctx_t;
 typedef void *rados_list_ctx_t;
 typedef uint64_t rados_snap_t;
 
-struct rados_ioctx_stat_t {
+struct rados_pool_stat_t {
   uint64_t num_bytes;    // in bytes
   uint64_t num_kb;       // in KB
   uint64_t num_objects;
@@ -101,7 +101,7 @@ int rados_ioctx_create(rados_t cluster, const char *pool_name, rados_ioctx_t *io
 void rados_ioctx_destroy(rados_ioctx_t io);
 int rados_ioctx_lookup(rados_t cluster, const char *pool_name);
 
-int rados_ioctx_stat(rados_ioctx_t io, struct rados_ioctx_stat_t *stats);
+int rados_ioctx_pool_stat(rados_ioctx_t io, struct rados_pool_stat_t *stats);
 
 int rados_pool_create(rados_t cluster, const char *pool_name);
 int rados_pool_create_with_auid(rados_t cluster, const char *pool_name, uint64_t auid);

diff --git a/src/librados.cc b/src/librados.cc
index 496aa3ba22678737f97c28f4ef13560c6fb2152e..b4c12b61d6b43abcfbb9ca7ee9360a4b4ab11af8 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -2658,7 +2658,7 @@ extern "C" void rados_ioctx_destroy(rados_ioctx_t io)
   ctx->put();
 }
 
-extern "C" int rados_ioctx_stat(rados_ioctx_t io, struct rados_ioctx_stat_t *stats)
+extern "C" int rados_ioctx_pool_stat(rados_ioctx_t io, struct rados_pool_stat_t *stats)
 {
   librados::IoCtxImpl *io_ctx_impl = (librados::IoCtxImpl *)io;
   list<string> ls;

diff --git a/src/testlibrbd.c b/src/testlibrbd.c
index a267d38b2ee0236f5212116bb4ddcb67c52d04f4..a52772ad67aeb31ba2a7a6af2851579dac292eb0 100644 (file)
--- a/src/testlibrbd.c
+++ b/src/testlibrbd.c
@@ -272,8 +272,8 @@ int main(int argc, const char **argv)
   int r = rados_pool_create(cluster, TEST_POOL);
   printf("rados_pool_create returned %d\n", r);
   assert(rados_ioctx_create(cluster, TEST_POOL, &io_ctx) == 0);
-  struct rados_ioctx_stat_t stats;
-  rados_ioctx_stat(io_ctx, &stats);
+  struct rados_pool_stat_t stats;
+  rados_ioctx_pool_stat(io_ctx, &stats);
   test_ls(io_ctx, 0);
   test_ls(io_ctx, 0);
   test_create_and_stat(io_ctx, TEST_IMAGE, MB_BYTES(1));

diff --git a/src/testrados.c b/src/testrados.c
index 92054cd6616a7422dbd1a0310d46bb33f737355b..a5d30f3399a9a038644d83e8f9e153383bc87bef 100644 (file)
--- a/src/testrados.c
+++ b/src/testrados.c
@@ -99,9 +99,9 @@ int main(int argc, const char **argv)
 
 
   /* stat */
-  struct rados_ioctx_stat_t st;
-  r = rados_ioctx_stat(io_ctx, &st);
-  printf("rados_ioctx_stat = %d, %lld KB, %lld objects\n", r, (long long)st.num_kb, (long long)st.num_objects);
+  struct rados_pool_stat_t st;
+  r = rados_ioctx_pool_stat(io_ctx, &st);
+  printf("rados_ioctx_pool_stat = %d, %lld KB, %lld objects\n", r, (long long)st.num_kb, (long long)st.num_objects);
 
   /* snapshots */
   r = rados_ioctx_snap_create(io_ctx, "snap1");
@@ -180,7 +180,7 @@ int main(int argc, const char **argv)
   rados_objects_list_close(h);
 
   /* stat */
-  r = rados_ioctx_stat(io_ctx, &st);
+  r = rados_ioctx_pool_stat(io_ctx, &st);
   printf("rados_stat_pool = %d, %lld KB, %lld objects\n", r, (long long)st.num_kb, (long long)st.num_objects);
 
   /* delete a pool */