rgw: do not include RWLock.h unless RWLock is used

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/rgw/rgw_coroutine.h b/src/rgw/rgw_coroutine.h
index 0d0b48bddc8395b2a80a90aeedd0fe00d9dab9c6..da5681d68cee718ed764fa15196935a0d7c76c85 100644 (file)
--- a/src/rgw/rgw_coroutine.h
+++ b/src/rgw/rgw_coroutine.h
@@ -21,7 +21,6 @@
 #include "common/debug.h"
 #include "common/Timer.h"
 #include "common/admin_socket.h"
-#include "common/RWLock.h"
 
 #include "rgw_common.h"
 #include "rgw_http_client_types.h"

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index e6436043b9da7507b2a578bd9d9e08ecc331b5aa..0412a6b9a3f39f52930210efb0c46d4d06182355 100644 (file)
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -2,7 +2,6 @@
 // vim: ts=8 sw=2 smarttab ft=cpp
 
 #include "common/ceph_json.h"
-#include "common/RWLock.h"
 #include "common/RefCountedObj.h"
 #include "common/WorkQueue.h"
 #include "common/Throttle.h"

diff --git a/src/rgw/rgw_data_sync.h b/src/rgw/rgw_data_sync.h
index 25db8da2fc8096caaa9eb243526554a4613bb844..7ecac3f56944bcd36d8779c048cffbfac2351cfe 100644 (file)
--- a/src/rgw/rgw_data_sync.h
+++ b/src/rgw/rgw_data_sync.h
@@ -6,7 +6,6 @@
 
 #include "include/encoding.h"
 
-#include "common/RWLock.h"
 #include "common/ceph_json.h"
 
 #include "rgw_coroutine.h"

diff --git a/src/rgw/rgw_frontend.h b/src/rgw/rgw_frontend.h
index 50519b21deac226d6583400ee97785120f3b204c..546cfef0e4e488461f77a4e597cc7dd976b62263 100644 (file)
--- a/src/rgw/rgw_frontend.h
+++ b/src/rgw/rgw_frontend.h
@@ -7,6 +7,8 @@
 #include <map>
 #include <string>
 
+#include "common/RWLock.h"
+
 #include "rgw_request.h"
 #include "rgw_process.h"
 #include "rgw_realm_reloader.h"

diff --git a/src/rgw/rgw_http_client.cc b/src/rgw/rgw_http_client.cc
index 06559a4790ff82d165356b0beaacb140ace068e7..761f6f24c5a458b2926b8060da5b21806fc80ee7 100644 (file)
--- a/src/rgw/rgw_http_client.cc
+++ b/src/rgw/rgw_http_client.cc
@@ -661,7 +661,7 @@ static int clear_signal(int fd)
   // since we're in non-blocking mode, we can try to read a lot more than
   // one signal from signal_thread() to avoid later wakeups. non-blocking reads
   // are also required to support the curl_multi_wait bug workaround
-  std::array<char, 256> buf;
+  std::array<char, 256> buf{};
   int ret = ::read(fd, (void *)buf.data(), buf.size());
   if (ret < 0) {
     ret = -errno;

diff --git a/src/rgw/rgw_http_client.h b/src/rgw/rgw_http_client.h
index 840ff88fe97d91d97b0c211b1542c4c72253d0ef..010537ac656dd8f43b48abebb6b525322a589d3a 100644 (file)
--- a/src/rgw/rgw_http_client.h
+++ b/src/rgw/rgw_http_client.h
@@ -5,7 +5,6 @@
 #define CEPH_RGW_HTTP_CLIENT_H
 
 #include "common/async/yield_context.h"
-#include "common/RWLock.h"
 #include "common/Cond.h"
 #include "rgw_common.h"
 #include "rgw_string.h"

diff --git a/src/rgw/rgw_mdlog.h b/src/rgw/rgw_mdlog.h
index 9064f8c0417874fb6bf9e139d11b0a5b7d06143d..53f5df762b960704bc38f180ca515e08e0beaceb 100644 (file)
--- a/src/rgw/rgw_mdlog.h
+++ b/src/rgw/rgw_mdlog.h
@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include "common/RWLock.h"
+
 #include "rgw_metadata.h"
 #include "rgw_mdlog_types.h"
 

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index f4564104c4b105e7c4e9aa0ae2d17f2799608d9b..e45125984db492817025f9269839b07c4f4a88bb 100644 (file)
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -10,7 +10,6 @@
 #include "include/rados/librados.hpp"
 #include "include/Context.h"
 #include "common/RefCountedObj.h"
-#include "common/RWLock.h"
 #include "common/ceph_time.h"
 #include "rgw_common.h"
 #include "cls/rgw/cls_rgw_types.h"

diff --git a/src/rgw/rgw_sync.cc b/src/rgw/rgw_sync.cc
index 078786d698393da78b13ee7f282dce59352b59a8..5b9b9e94a38777eec70f8b135ebd0617b9516add 100644 (file)
--- a/src/rgw/rgw_sync.cc
+++ b/src/rgw/rgw_sync.cc
@@ -4,7 +4,6 @@
 #include <boost/optional.hpp>
 
 #include "common/ceph_json.h"
-#include "common/RWLock.h"
 #include "common/RefCountedObj.h"
 #include "common/WorkQueue.h"
 #include "common/Throttle.h"

diff --git a/src/rgw/rgw_sync.h b/src/rgw/rgw_sync.h
index 4d0d72c9839f9ec150d585c342e10e065016aca9..5938de233fcd3ab10165a8b5db330b2ef283d596 100644 (file)
--- a/src/rgw/rgw_sync.h
+++ b/src/rgw/rgw_sync.h
@@ -7,7 +7,6 @@
 #include <atomic>
 
 #include "include/stringify.h"
-#include "common/RWLock.h"
 
 #include "rgw_coroutine.h"
 #include "rgw_http_client.h"

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index 07822c48189aa87dcc5554ebb25206549fdfeab2..4ab78e25a5a9363d985b8342fdb016692ecb1e50 100644 (file)
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -10,7 +10,6 @@
 #include "common/errno.h"
 #include "common/Formatter.h"
 #include "common/ceph_json.h"
-#include "common/RWLock.h"
 #include "rgw_sal_rados.h"
 #include "rgw_zone.h"
 #include "rgw_acl.h"

diff --git a/src/rgw/services/svc_rados.h b/src/rgw/services/svc_rados.h
index 57b4cd54209ff7a5aba013bffc354cfdb4eaef91..c167019e241ffe4c6c8bfbdbe1d923610291478c 100644 (file)
--- a/src/rgw/services/svc_rados.h
+++ b/src/rgw/services/svc_rados.h
@@ -7,7 +7,6 @@
 
 #include "include/rados/librados.hpp"
 #include "common/async/yield_context.h"
-#include "common/RWLock.h"
 
 class RGWAsyncRadosProcessor;
 

diff --git a/src/rgw/services/svc_sys_obj_cache.h b/src/rgw/services/svc_sys_obj_cache.h
index a0184e89df2bdb294a150c9b4def9aec03a75936..c4ca6b21be6c882de13afe57f6885a9a76c27940 100644 (file)
--- a/src/rgw/services/svc_sys_obj_cache.h
+++ b/src/rgw/services/svc_sys_obj_cache.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include "common/RWLock.h"
 #include "rgw/rgw_service.h"
 #include "rgw/rgw_cache.h"