librados: rename statfs to cluster_stat

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index ec537c527af172de33024837e75134ca8c5fc167..18726b753d0e2ac11485df0b6757695b78cf15e0 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -17,7 +17,7 @@ extern "C" {
 
 #define LIBRADOS_VER_MAJOR 0
 #define LIBRADOS_VER_MINOR 25
-#define LIBRADOS_VER_EXTRA 0
+#define LIBRADOS_VER_EXTRA 1
 
 #define LIBRADOS_VERSION(maj, min, extra) ((maj << 16) + (min << 8) + extra)
 
@@ -42,7 +42,7 @@ struct rados_pool_stat_t {
   uint64_t num_rd, num_rd_kb,num_wr, num_wr_kb;
 };
 
-struct rados_statfs_t {
+struct rados_cluster_stat_t {
   uint64_t kb, kb_used, kb_avail;
   uint64_t num_objects;
 };
@@ -85,7 +85,7 @@ void rados_reopen_log(rados_t cluster);
 int rados_conf_get(rados_t cluster, const char *option, char *buf, size_t len);
 
 /* cluster info */
-int rados_statfs(rados_t cluster, struct rados_statfs_t *result);
+int rados_cluster_stat(rados_t cluster, struct rados_cluster_stat_t *result);
 
 
 /* pools */

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 08a5ff91139bab8f1959348f31e504ae2736f0b4..dd875b708983a21ebaccaa1553830b51cb0b343d 100644 (file)
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -25,7 +25,7 @@ namespace librados
   typedef uint64_t snap_t;
   typedef uint64_t auid_t;
 
-  struct statfs_t {
+  struct cluster_stat_t {
     uint64_t kb, kb_used, kb_avail;
     uint64_t num_objects;
   };
@@ -224,7 +224,7 @@ namespace librados
     int pool_list(std::list<std::string>& v);
     int get_pool_stats(std::list<std::string>& v,
                       std::map<std::string,pool_stat_t>& stats);
-    int statfs(statfs_t& result);
+    int cluster_stat(cluster_stat_t& result);
 
     // -- aio --
     static AioCompletion *aio_create_completion();

diff --git a/src/librados.cc b/src/librados.cc
index dbc23118a37bb349eff0c294d2553308a00b16d3..8800920213194784599d2d889d786297a4e93322 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -2476,7 +2476,7 @@ get_pool_stats(std::list<string>& v, std::map<string,pool_stat_t>& result)
 }
 
 int librados::Rados::
-statfs(statfs_t& result)
+cluster_stat(cluster_stat_t& result)
 {
   ceph_statfs stats;
   int r = client->get_fs_stats(stats);
@@ -2600,7 +2600,7 @@ extern "C" void rados_reopen_log(rados_t cluster)
 }
 
 /* cluster info */
-extern "C" int rados_statfs(rados_t cluster, rados_statfs_t *result)
+extern "C" int rados_cluster_stat(rados_t cluster, rados_cluster_stat_t *result)
 {
   librados::RadosClient *client = (librados::RadosClient *)cluster;
 

diff --git a/src/rados.cc b/src/rados.cc
index 48b9b1d5483e25dd0c83385f10c2fa189b23fa2f..6530c75884813f05f6f3a969254dc69c5622d739 100644 (file)
--- a/src/rados.cc
+++ b/src/rados.cc
@@ -216,8 +216,8 @@ int main(int argc, const char **argv)
     }
 
     // total
-    statfs_t tstats;
-    rados.statfs(tstats);
+    cluster_stat_t tstats;
+    rados.cluster_stat(tstats);
     printf("  total used    %12lld %12lld\n", (long long unsigned)tstats.kb_used,
           (long long unsigned)tstats.num_objects);
     printf("  total avail   %12lld\n", (long long unsigned)tstats.kb_avail);