From: Igor Fedotov <ifedotov@mirantis.com>
Date: Fri, 22 Jan 2016 22:41:48 +0000 (+0300)
Subject: Removing duplicate definitions for rados pool_stat_t and cluster_stat_t
X-Git-Tag: v10.0.4~131^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ab01c0e39e3ce67a847bd5db9f3558e9da4eeaa5;p=ceph.git

Removing duplicate definitions for rados pool_stat_t and cluster_stat_t

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
---

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 9173bf5c13b8..373c5072fe52 100644
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -37,22 +37,8 @@ namespace librados
   typedef uint64_t auid_t;
   typedef void *config_t;
 
-  struct cluster_stat_t {
-    uint64_t kb, kb_used, kb_avail;
-    uint64_t num_objects;
-  };
-
-  struct pool_stat_t {
-    uint64_t num_bytes;    // in bytes
-    uint64_t num_kb;       // in KB
-    uint64_t num_objects;
-    uint64_t num_object_clones;
-    uint64_t num_object_copies;  // num_objects * num_replicas
-    uint64_t num_objects_missing_on_primary;
-    uint64_t num_objects_unfound;
-    uint64_t num_objects_degraded;
-    uint64_t num_rd, num_rd_kb, num_wr, num_wr_kb;
-  };
+  typedef struct rados_cluster_stat_t cluster_stat_t;
+  typedef struct rados_pool_stat_t pool_stat_t;
 
   typedef struct {
     std::string client;