Skip to contentSkip to conversation

xfs: fix duplicate includes

PATCH In review Dave Chinner 2 participants 2 messages Apr 15, 2023 – Apr 16, 2023 XFS filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs: fix duplicate includes

From: Dave Chinner <[email protected]>

Header files were already included, just not in the normal order. Remove the duplicates, preserving normal order. Also move xfs_ag.h include to before the scrub internal includes which are normally last in the include list.

Fixes d5c88131dbf0 ("xfs: allow queued AG intents to drain before scrubbing")
---
 fs/xfs/scrub/refcount.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
fs/xfs/scrub/refcount.c +1 -3
index ed5eb367ce49..304ea1e1bfb0 100644
@@ -9,6 +9,7 @@
 #include "xfs_format.h"
 #include "xfs_trans_resv.h"
 #include "xfs_mount.h"
+#include "xfs_ag.h"
 #include "xfs_btree.h"
 #include "xfs_rmap.h"
 #include "xfs_refcount.h"
@@ -16,9 +17,6 @@
 #include "scrub/common.h"
 #include "scrub/btree.h"
 #include "scrub/trace.h"
-#include "xfs_trans_resv.h"
-#include "xfs_mount.h"
-#include "xfs_ag.h"
 
 /*
  * Set us up to scrub reference count btrees.
Signature · 1 line
2.39.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Dave Chinner

From: Dave Chinner <[email protected]>

Header files were already included, just not in the normal order. Remove the duplicates, preserving normal order. Also move xfs_ag.h include to before the scrub internal includes which are normally last in the include list.

Fixes d5c88131dbf0 ("xfs: allow queued AG intents to drain before scrubbing")

--D

Quoted 29 lines
---
 fs/xfs/scrub/refcount.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
fs/xfs/scrub/refcount.c +1 -3
index ed5eb367ce49..304ea1e1bfb0 100644
@@ -9,6 +9,7 @@
 #include "xfs_format.h"
 #include "xfs_trans_resv.h"
 #include "xfs_mount.h"
+#include "xfs_ag.h"
 #include "xfs_btree.h"
 #include "xfs_rmap.h"
 #include "xfs_refcount.h"
@@ -16,9 +17,6 @@
 #include "scrub/common.h"
 #include "scrub/btree.h"
 #include "scrub/trace.h"
-#include "xfs_trans_resv.h"
-#include "xfs_mount.h"
-#include "xfs_ag.h"
 
 /*
  * Set us up to scrub reference count btrees.
Signature · 1 line
2.39.2