2023-04-17 08:14:11

by ye.xingchen

Subject: [PATCH] xfs: scrub: remove duplicate include headers

From: Ye Xingchen <[email protected]>

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

Signed-off-by: Ye Xingchen <[email protected]>
---
fs/xfs/scrub/health.c | 2 --
fs/xfs/scrub/refcount.c | 2 --
2 files changed, 4 deletions(-)

diff --git a/fs/xfs/scrub/health.c b/fs/xfs/scrub/health.c
index d2b2a1cb6533..66e99b0f6049 100644
--- a/fs/xfs/scrub/health.c
+++ b/fs/xfs/scrub/health.c
@@ -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"
diff --git a/fs/xfs/scrub/refcount.c b/fs/xfs/scrub/refcount.c
index ed5eb367ce49..04d216261f36 100644
--- a/fs/xfs/scrub/refcount.c
+++ b/fs/xfs/scrub/refcount.c
@@ -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"
--
2.25.1

2023-04-17 21:55:36

by Dave Chinner

Subject: Re: [PATCH] xfs: scrub: remove duplicate include headers

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.
>
> Signed-off-by: Ye Xingchen <[email protected]>

Yes they are, but it's already been fixed:

https://lore.kernel.org/linux-xfs/[email protected]/

-Dave.
--
Dave Chinner
[email protected]

2023-04-18 00:22:35

by Darrick J. Wong

Subject: Re: [PATCH] xfs: scrub: remove duplicate include headers

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.
>
> Signed-off-by: Ye Xingchen <[email protected]>
> ---
> fs/xfs/scrub/health.c | 2 --
> fs/xfs/scrub/refcount.c | 2 --
> 2 files changed, 4 deletions(-)
>
> diff --git a/fs/xfs/scrub/health.c b/fs/xfs/scrub/health.c
> index d2b2a1cb6533..66e99b0f6049 100644
> --- a/fs/xfs/scrub/health.c
> +++ b/fs/xfs/scrub/health.c
> @@ -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...

> diff --git a/fs/xfs/scrub/refcount.c b/fs/xfs/scrub/refcount.c
> index ed5eb367ce49..04d216261f36 100644
> --- a/fs/xfs/scrub/refcount.c
> +++ b/fs/xfs/scrub/refcount.c

Please check the list before sending duplicate diffs.

--D

> @@ -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"
> --
> 2.25.1