From 9f88b5bf5ecba916704ec498fbe81c4ac2bd2e5b Mon Sep 17 00:00:00 2001
From: Greg Farnum <gregf@hq.newdream.net>
Date: Thu, 11 Jun 2009 15:08:53 -0700
Subject: [PATCH] Rebase and better naming.

---
 src/include/librados.h | 19 ++++++-------------
 src/librados.cc        | 22 ++++++++--------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/include/librados.h b/src/include/librados.h
index c7a8aadf95254..3b477fa43f589 100644
--- a/src/include/librados.h
+++ b/src/include/librados.h
@@ -36,18 +36,11 @@ struct rados_pool_stat_t {
   long long unsigned num_objects_degraded;
 };
 
-struct ceph_stat_fs_t {
-  int f_bsize;
-  int f_frsize;
-  int f_blocks;
-  int f_bfree;
-  int f_bavail;
-  int f_files;
-  int f_ffree;
-  int f_favail;
-  int f_fsid;
-  int f_flag;
-  int f_namemax;
+struct rados_statfs_t {
+  int f_total;
+  int f_free;
+  int f_avail;
+  int f_objects;
 };
 
 int rados_open_pool(const char *name, rados_pool_t *pool);
@@ -119,7 +112,7 @@ public:
   int list_pools(std::vector<std::string>& v);
   int get_pool_stats(std::vector<std::string>& v,
 		     std::map<std::string,rados_pool_stat_t>& stats);
-  int get_fs_stats(ceph_stat_fs_t& result);
+  int get_fs_stats(rados_statfs_t& result);
 
   int snap_create(rados_pool_t pool, const char *snapname);
   int snap_remove(rados_pool_t pool, const char *snapname);
diff --git a/src/librados.cc b/src/librados.cc
index 82074a39d2622..ae6aea46de933 100644
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -110,7 +110,7 @@ public:
 
   int list_pools(std::vector<string>& ls);
   int get_pool_stats(std::vector<string>& ls, map<string,rados_pool_stat_t>& result);
-  int get_fs_stats( ceph_stat_fs_t& result );
+  int get_fs_stats( rados_statfs_t& result );
 
   int list(PoolCtx& pool, int max_entries, std::list<object_t>& entries, RadosClient::PGLSOp& op);
 
@@ -418,7 +418,7 @@ int RadosClient::get_pool_stats(std::vector<string>& pools, map<string,rados_poo
   return 0;
 }
 
-int RadosClient::get_fs_stats( ceph_stat_fs_t& result ) {
+int RadosClient::get_fs_stats( rados_statfs_t& result ) {
   ceph_statfs stats;
 
   Mutex mylock ("RadosClient::get_fs_stats::mylock");
@@ -432,17 +432,11 @@ int RadosClient::get_fs_stats( ceph_stat_fs_t& result ) {
   while (!done) cond.Wait(mylock);
   mylock.Unlock();
 
-  result.f_bsize = 4096;
-  result.f_frsize = 4096;
-  result.f_blocks = stats.f_total / 4 ;
-  result.f_bfree = stats.f_free / 4;
-  result.f_bavail = stats.f_avail / 4;
-  result.f_files = stats.f_objects / 4;
-  result.f_ffree = -1;
-  result.f_favail = -1;
-  result.f_fsid = -1;
-  result.f_flag = 0;
-  result.f_namemax = 1024;
+  //divide by 4 to give it as Posix expects.
+  result.f_total = stats.f_total / 4 ;
+  result.f_free = stats.f_free / 4;
+  result.f_avail = stats.f_avail / 4;
+  result.f_objects = stats.f_objects / 4;
   return 0;
 }
 
@@ -809,7 +803,7 @@ int Rados::get_pool_stats(std::vector<string>& v, std::map<string,rados_pool_sta
   return client->get_pool_stats(v, result);
 }
 
-int Rados::get_fs_stats(ceph_stat_fs_t& result) {
+int Rados::get_fs_stats(rados_statfs_t& result) {
   if(!client) return -EINVAL;
   return client->get_fs_stats(result);
 }
-- 
2.39.5