os: do not include RWLock.h unless it is used

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index e6d6d520a157175786bc94f75d66fb4baff4bb19..853a11e1dcb458489a64702f6e4b38fa1ea5c4f3 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -34,7 +34,6 @@
 #include "common/errno.h"
 #include "common/safe_io.h"
 #include "common/PriorityCache.h"
-#include "common/RWLock.h"
 #include "Allocator.h"
 #include "FreelistManager.h"
 #include "BlueFS.h"
@@ -11719,7 +11718,7 @@ out:
 
 void BlueStore::_osr_attach(Collection *c)
 {
-  // note: caller has RWLock on coll_map
+  // note: caller has coll_lock
   auto q = coll_map.find(c->cid);
   if (q != coll_map.end()) {
     c->osr = q->second->osr;

diff --git a/src/os/filestore/CollectionIndex.h b/src/os/filestore/CollectionIndex.h
index ff3d706cf87fc8e7db626a05b20b9b9c87a461cb..16f3103650cc1b63ced174b1310e0d0a93645edb 100644 (file)
--- a/src/os/filestore/CollectionIndex.h
+++ b/src/os/filestore/CollectionIndex.h
@@ -20,7 +20,6 @@
 
 #include "osd/osd_types.h"
 #include "include/object.h"
-#include "common/RWLock.h"
 
 /**
   CollectionIndex provides an interface for manipulating indexed collections

diff --git a/src/os/filestore/JournalingObjectStore.h b/src/os/filestore/JournalingObjectStore.h
index de4378b000c09bc7c649fdb533f8433344177c38..38c54226f4db9d126711912070f290c5dd7f3422 100644 (file)
--- a/src/os/filestore/JournalingObjectStore.h
+++ b/src/os/filestore/JournalingObjectStore.h
@@ -18,7 +18,6 @@
 #include "os/ObjectStore.h"
 #include "Journal.h"
 #include "FileJournal.h"
-#include "common/RWLock.h"
 #include "osd/OpRequest.h"
 
 class JournalingObjectStore : public ObjectStore {

diff --git a/src/os/kstore/KStore.h b/src/os/kstore/KStore.h
index b76b4dcfb36abe48a38945fd4b5dcb5d30b70e41..16c4266ee8ed6528c94bf2993963ed72c40ab5f7 100644 (file)
--- a/src/os/kstore/KStore.h
+++ b/src/os/kstore/KStore.h
@@ -26,7 +26,6 @@
 #include "include/ceph_assert.h"
 #include "include/unordered_map.h"
 #include "common/Finisher.h"
-#include "common/RWLock.h"
 #include "common/Throttle.h"
 #include "common/WorkQueue.h"
 #include "os/ObjectStore.h"

diff --git a/src/os/memstore/MemStore.h b/src/os/memstore/MemStore.h
index 04c3e08d0ad656e4f80ae0c5b8046e9749a6d456..92304a4507be518d5259c73342c0f5315a5d3673 100644 (file)
--- a/src/os/memstore/MemStore.h
+++ b/src/os/memstore/MemStore.h
@@ -22,7 +22,6 @@
 #include "include/unordered_map.h"
 #include "common/Finisher.h"
 #include "common/RefCountedObj.h"
-#include "common/RWLock.h"
 #include "os/ObjectStore.h"
 #include "PageSet.h"
 #include "include/ceph_assert.h"