cls: Formatting changes and merge fixup

Fix white space inconsistencies and resolve compile error.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

diff --git a/src/cls/lock/cls_lock_client.h b/src/cls/lock/cls_lock_client.h
index 79999f017a4d574ac24b73dbca56f8a4e6974244..7aa06238f179d18640dce30fad79df0b65f919de 100644 (file)
--- a/src/cls/lock/cls_lock_client.h
+++ b/src/cls/lock/cls_lock_client.h
@@ -7,10 +7,11 @@
 #include "cls/lock/cls_lock_types.h"
 
 namespace librados {
-    class ObjectWriteOperation;
-    class IoCtx;
-    class ObjectReadOperation;
-    class ObjectOperation;
+  class AioCompletion;
+  class ObjectWriteOperation;
+  class IoCtx;
+  class ObjectReadOperation;
+  class ObjectOperation;
 }
 
 namespace rados {

diff --git a/src/cls/log/cls_log_client.h b/src/cls/log/cls_log_client.h
index dd3b8feac3701f204f5a52dc991ec0919bfc17d6..5af80755596ebefe36876d7cb8cfc8c1ce73eab5 100644 (file)
--- a/src/cls/log/cls_log_client.h
+++ b/src/cls/log/cls_log_client.h
@@ -4,9 +4,9 @@
 #include "cls_log_types.h"
 
 namespace librados {
-    class ObjectWriteOperation;
-    class ObjectReadOperation;
-    class IoCtx;
+  class ObjectWriteOperation;
+  class ObjectReadOperation;
+  class IoCtx;
 }
 
 /*

diff --git a/src/cls/refcount/cls_refcount_client.h b/src/cls/refcount/cls_refcount_client.h
index 76ed08e8f726922bc7739dbc6a8776c380be4036..654cc00f3248bb8dfb3bf90ed6159f84cdfb0589 100644 (file)
--- a/src/cls/refcount/cls_refcount_client.h
+++ b/src/cls/refcount/cls_refcount_client.h
@@ -4,8 +4,8 @@
 #include "include/types.h"
 
 namespace librados {
-        class ObjectWriteOperation;
-        class IoCtx;
+  class ObjectWriteOperation;
+  class IoCtx;
 }
 
 /*

diff --git a/src/cls/replica_log/cls_replica_log_client.h b/src/cls/replica_log/cls_replica_log_client.h
index 0ca53c5c677e6bfea3a46bbc5c1b85fae33bb13b..407de814d537b8236c9dcbc189607a117c45d35f 100644 (file)
--- a/src/cls/replica_log/cls_replica_log_client.h
+++ b/src/cls/replica_log/cls_replica_log_client.h
@@ -15,8 +15,8 @@
 #include "cls_replica_log_ops.h"
 
 namespace librados {
-    class ObjectWriteOperation;
-    class IoCtx;
+  class ObjectWriteOperation;
+  class IoCtx;
 }
 
 /**

diff --git a/src/cls/statelog/cls_statelog_client.h b/src/cls/statelog/cls_statelog_client.h
index 447c0c5c13d04a4d8499d3846152b754ac626ce3..514c307be70c17b63e4886938b2801e8151467ef 100644 (file)
--- a/src/cls/statelog/cls_statelog_client.h
+++ b/src/cls/statelog/cls_statelog_client.h
@@ -4,9 +4,9 @@
 #include "cls_statelog_ops.h"
 
 namespace librados {
-        class ObjectWriteOperation;
-        class ObjectReadOperation;
-        class ObjectOperation;
+  class ObjectWriteOperation;
+  class ObjectReadOperation;
+  class ObjectOperation;
 }
 
 /*

diff --git a/src/cls/timeindex/cls_timeindex_client.cc b/src/cls/timeindex/cls_timeindex_client.cc
index 1e9d83e88f4a98ccada779614bbf5e49d14a1873..502b9300ee095ac90969374d068d77753dee12a4 100644 (file)
--- a/src/cls/timeindex/cls_timeindex_client.cc
+++ b/src/cls/timeindex/cls_timeindex_client.cc
@@ -5,7 +5,6 @@
 
 #include "cls/timeindex/cls_timeindex_ops.h"
 #include "cls/timeindex/cls_timeindex_client.h"
-#include "include/rados/librados.hpp"
 #include "include/compat.h"
 
 void cls_timeindex_add(

diff --git a/src/cls/timeindex/cls_timeindex_client.h b/src/cls/timeindex/cls_timeindex_client.h
index 65a622c19916db55367fada0c107c61b11029eff..30efccdc8dec87154636383ae98fdfab7a0a48ac 100644 (file)
--- a/src/cls/timeindex/cls_timeindex_client.h
+++ b/src/cls/timeindex/cls_timeindex_client.h
@@ -4,6 +4,8 @@
 #ifndef CEPH_CLS_TIMEINDEX_CLIENT_H
 #define CEPH_CLS_TIMEINDEX_CLIENT_H
 
+#include "include/rados/librados.hpp"
+
 #include "cls_timeindex_ops.h"
 
 namespace librados {

diff --git a/src/cls/user/cls_user_client.h b/src/cls/user/cls_user_client.h
index 89541092e04d7bdb8051866daa855ad18318872f..5e5d3063d011b00226b954dcc9c1f1dd170549fe 100644 (file)
--- a/src/cls/user/cls_user_client.h
+++ b/src/cls/user/cls_user_client.h
@@ -8,9 +8,9 @@
 #include "common/RefCountedObj.h"
 
 namespace librados {
-        class ObjectWriteOperation;
-        class ObjectReadOperation;
-        class IoCtx;
+  class ObjectWriteOperation;
+  class ObjectReadOperation;
+  class IoCtx;
 }
 
 class RGWGetUserHeader_CB : public RefCountedObject {

diff --git a/src/cls/version/cls_version_client.h b/src/cls/version/cls_version_client.h
index df8a11c8c5ac5a344d62b5e5c6b4c16c2f60938c..83a3d8c22cb6eb7a64572b0e7f05ece276bac563 100644 (file)
--- a/src/cls/version/cls_version_client.h
+++ b/src/cls/version/cls_version_client.h
@@ -4,10 +4,10 @@
 #include "cls_version_ops.h"
 
 namespace librados {
-        class ObjectWriteOperation;
-        class ObjectReadOperation;
-        class ObjectOperation;
-        class IoCtx;
+  class ObjectWriteOperation;
+  class ObjectReadOperation;
+  class ObjectOperation;
+  class IoCtx;
 }
 
 /*