From: Radosław Zarzyński <rzarzyns@redhat.com>
Date: Sun, 14 May 2023 12:12:37 +0000 (+0200)
Subject: os/bluestore: get rid of inclusion-in-the-middle from BlueStore.cc
X-Git-Tag: v19.0.0~921^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9f013a22f975c5e0428ffcf0145a996bd09fc64;p=ceph.git

os/bluestore: get rid of inclusion-in-the-middle from BlueStore.cc

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index a489cb65d2e1..df4250678674 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -50,6 +50,7 @@
 #include "common/blkdev.h"
 #include "common/numa.h"
 #include "common/pretty_binary.h"
+#include "common/WorkQueue.h"
 #include "kv/KeyValueHistogram.h"
 
 #ifdef HAVE_LIBZBD
@@ -8467,8 +8468,6 @@ BlueStore::OnodeRef BlueStore::fsck_check_objects_shallow(
   return o;
 }
 
-#include "common/WorkQueue.h"
-
 class ShallowFSCKThreadPool : public ThreadPool
 {
 public:
@@ -19180,8 +19179,6 @@ int BlueStore::read_allocation_from_drive_on_startup()
 // Not meant to be run by customers
 #ifdef CEPH_BLUESTORE_TOOL_RESTORE_ALLOCATION
 
-#include <stdlib.h>
-#include <algorithm>
 //---------------------------------------------------------
 int cmpfunc (const void * a, const void * b)
 {