Skip to contentSkip to conversation

xfs: scrub: remove duplicate include headers

PATCH In review [email protected] 3 participants 3 messages Apr 17, 2023 – Apr 18, 2023 XFS filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs: scrub: remove duplicate include headers

From: Ye Xingchen <[email protected]>

xfs_trans_resv.h and xfs_mount.h are included more than once.

---
 fs/xfs/scrub/health.c   | 2 --
 fs/xfs/scrub/refcount.c | 2 --
 2 files changed, 4 deletions(-)
fs/xfs/scrub/health.c +0 -2
index d2b2a1cb6533..66e99b0f6049 100644
@@ -7,8 +7,6 @@
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"
-#include "xfs_trans_resv.h"
-#include "xfs_mount.h"
 #include "xfs_btree.h"
 #include "xfs_trans_resv.h"
 #include "xfs_mount.h"
fs/xfs/scrub/refcount.c +0 -2
index ed5eb367ce49..04d216261f36 100644
@@ -7,8 +7,6 @@
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"
-#include "xfs_trans_resv.h"
-#include "xfs_mount.h"
 #include "xfs_btree.h"
 #include "xfs_rmap.h"
 #include "xfs_refcount.h"
Signature · 1 line
2.25.1
#2 lore raw
In reply to [email protected]
Quoted 15 lines · On Mon, Apr 17, 2023 at 04:13:07PM +0800, [email protected] wrote:

From: Ye Xingchen <[email protected]>

xfs_trans_resv.h and xfs_mount.h are included more than once.

---
 fs/xfs/scrub/health.c   | 2 --
 fs/xfs/scrub/refcount.c | 2 --
 2 files changed, 4 deletions(-)
fs/xfs/scrub/health.c +0 -0
index d2b2a1cb6533..66e99b0f6049 100644

fs/xfs/scrub/health.c line 12

Quoted 8 lines
fs/xfs/scrub/health.c +0 -2
@@ -7,8 +7,6 @@
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"
-#include "xfs_trans_resv.h"
-#include "xfs_mount.h"
 #include "xfs_btree.h"
 #include "xfs_trans_resv.h"
 #include "xfs_mount.h"

The convention (AFAICT) for include order is xfs_trans_resv -> xfs_mount -> xfs_btree.h...

fs/xfs/scrub/refcount.c

Quoted 4 lines
fs/xfs/scrub/refcount.c +0 -0
index ed5eb367ce49..04d216261f36 100644

Please check the list before sending duplicate diffs.

--D

Quoted 11 lines
fs/xfs/scrub/refcount.c +0 -2
@@ -7,8 +7,6 @@
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"
-#include "xfs_trans_resv.h"
-#include "xfs_mount.h"
 #include "xfs_btree.h"
 #include "xfs_rmap.h"
 #include "xfs_refcount.h"
Signature · 1 line
2.25.1