From f45a790f6e272e59cd57b636c4b03c0d24376cda Mon Sep 17 00:00:00 2001 From: Colin Patrick McCabe Date: Tue, 1 Mar 2011 06:49:34 -0800 Subject: [PATCH] librados:rados_ioctx_stat -> rados_ioctx_pool_stat Signed-off-by: Colin McCabe --- src/include/rados/librados.h | 4 ++-- src/librados.cc | 2 +- src/testlibrbd.c | 4 ++-- src/testrados.c | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h index d7ff1a8a20279..2468a7971af26 100644 --- 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 496aa3ba22678..b4c12b61d6b43 100644 --- 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 ls; diff --git a/src/testlibrbd.c b/src/testlibrbd.c index a267d38b2ee02..a52772ad67aeb 100644 --- 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 92054cd6616a7..a5d30f3399a9a 100644 --- 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 */ -- 2.39.5