From fdd72c04a856042db107e6cd697e8a4880526c25 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Wed, 10 Mar 2021 19:20:13 +0800
Subject: [PATCH] os: do not include RWLock.h unless it is used

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/os/bluestore/BlueStore.cc            | 3 +--
 src/os/filestore/CollectionIndex.h       | 1 -
 src/os/filestore/JournalingObjectStore.h | 1 -
 src/os/kstore/KStore.h                   | 1 -
 src/os/memstore/MemStore.h               | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index e6d6d520a1571..853a11e1dcb45 100644
--- 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 ff3d706cf87fc..16f3103650cc1 100644
--- 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 de4378b000c09..38c54226f4db9 100644
--- 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 b76b4dcfb36ab..16c4266ee8ed6 100644
--- 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 04c3e08d0ad65..92304a4507be5 100644
--- 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"
-- 
2.39.5