From: Ye Xingchen <ye.xingchen@zte.com.cn>

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

Signed-off-by: Ye Xingchen <ye.xingchen@zte.com.cn>
---
 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

On Mon, Apr 17, 2023 at 04:13:07PM +0800, ye.xingchen@zte.com.cn wrote:
> From: Ye Xingchen <ye.xingchen@zte.com.cn>
> 
> xfs_trans_resv.h and xfs_mount.h are included more than once.
> 
> Signed-off-by: Ye Xingchen <ye.xingchen@zte.com.cn>
> ---
>  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

On Mon, Apr 17, 2023 at 04:13:07PM +0800, ye.xingchen@zte.com.cn wrote:
> From: Ye Xingchen <ye.xingchen@zte.com.cn>
> 
> xfs_trans_resv.h and xfs_mount.h are included more than once.
> 
> Signed-off-by: Ye Xingchen <ye.xingchen@zte.com.cn>

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

https://lore.kernel.org/linux-xfs/20230415224532.604844-1-david@fromorbit.com/

-Dave.
-- 
Dave Chinner
david@fromorbit.com