librados: rados_ioctx_lookup -> rados_pool_lookup

rados_pool_lookup has nothing to do with io contexts!

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

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index e1a248352bf99bd50d05ef384863bd37175386f4..fdafb381f8bb170971b16c4f536d2e2b66cfe293 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -107,10 +107,10 @@ int rados_pool_list(rados_t cluster, char *buf, size_t len);
 
 int rados_ioctx_create(rados_t cluster, const char *pool_name, rados_ioctx_t *ioctx);
 void rados_ioctx_destroy(rados_ioctx_t io);
-int rados_ioctx_lookup(rados_t cluster, const char *pool_name);
 
 int rados_ioctx_pool_stat(rados_ioctx_t io, struct rados_pool_stat_t *stats);
 
+int rados_pool_lookup(rados_t cluster, const char *pool_name);
 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);
 int rados_pool_create_with_crush_rule(rados_t cluster, const char *pool_name,

diff --git a/src/librados.cc b/src/librados.cc
index 8e9d3e9d53c1778f8e850db0b96babc7bf61ad54..fa13325fdd12432ec4948d3881a87b5a832a4b84 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -2715,7 +2715,7 @@ extern "C" int rados_conf_get(rados_t cluster, const char *option, char *buf, si
   return g_conf.get_val(option, &tmp, len);
 }
 
-extern "C" int rados_ioctx_lookup(rados_t cluster, const char *name)
+extern "C" int rados_pool_lookup(rados_t cluster, const char *name)
 {
   librados::RadosClient *radosp = (librados::RadosClient *)cluster;
   return radosp->lookup_pool(name);

diff --git a/src/testlibrbd.c b/src/testlibrbd.c
index 1ec9bcff091b182e033ca6190aad4edae5c7cbbe..fd2f9d5a8fbc69c6e0f5bb79bcc73c2ea87fd385 100644 (file)
--- a/src/testlibrbd.c
+++ b/src/testlibrbd.c
@@ -265,7 +265,7 @@ int main(int argc, const char **argv)
   assert(rados_conf_read_file(cluster, NULL) == 0);
   rados_reopen_log(cluster);
   assert(rados_connect(cluster) == 0);
-  if (rados_ioctx_lookup(cluster, TEST_POOL) != -ENOENT) {
+  if (rados_pool_lookup(cluster, TEST_POOL) != -ENOENT) {
     int r = rados_pool_delete(cluster, TEST_POOL);
     printf("rados_pool_delete returned %d\n", r);
   }