From: Brad Hubbard <bhubbard@redhat.com>
Date: Fri, 19 May 2017 05:07:22 +0000 (+1000)
Subject: cls: Formatting changes and merge fixup
X-Git-Tag: ses5-milestone6~8^2~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=59f7b23563cf9303b1a7362464553d14888b229b;p=ceph.git

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 79999f017a4d..7aa06238f179 100644
--- 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 dd3b8feac370..5af80755596e 100644
--- 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 76ed08e8f726..654cc00f3248 100644
--- 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 0ca53c5c677e..407de814d537 100644
--- 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 447c0c5c13d0..514c307be70c 100644
--- 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 1e9d83e88f4a..502b9300ee09 100644
--- 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 65a622c19916..30efccdc8dec 100644
--- 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 89541092e04d..5e5d3063d011 100644
--- 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 df8a11c8c5ac..83a3d8c22cb6 100644
--- 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;
 }
 
 /*