2017-12-06 16:16:24

by Pravin Shedge

Subject: [PATCH 22/45] fs: xfs: remove duplicate includes

These duplicate includes have been found with scripts/checkincludes.pl but
they have been removed manually to avoid removing false positives.

Signed-off-by: Pravin Shedge <[email protected]>
---
fs/xfs/scrub/scrub.c | 1 -
fs/xfs/scrub/trace.c | 1 -
fs/xfs/xfs_reflink.c | 2 --
fs/xfs/xfs_trace.c | 1 -
4 files changed, 5 deletions(-)

diff --git a/fs/xfs/scrub/scrub.c b/fs/xfs/scrub/scrub.c
index 9c42c4e..ab3aef2 100644
--- a/fs/xfs/scrub/scrub.c
+++ b/fs/xfs/scrub/scrub.c
@@ -46,7 +46,6 @@
#include "scrub/scrub.h"
#include "scrub/common.h"
#include "scrub/trace.h"
-#include "scrub/scrub.h"
#include "scrub/btree.h"

/*
diff --git a/fs/xfs/scrub/trace.c b/fs/xfs/scrub/trace.c
index 472080e..86daed0 100644
--- a/fs/xfs/scrub/trace.c
+++ b/fs/xfs/scrub/trace.c
@@ -26,7 +26,6 @@
#include "xfs_mount.h"
#include "xfs_defer.h"
#include "xfs_da_format.h"
-#include "xfs_defer.h"
#include "xfs_inode.h"
#include "xfs_btree.h"
#include "xfs_trans.h"
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index cc041a2..cf7c8f8 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -49,8 +49,6 @@
#include "xfs_alloc.h"
#include "xfs_quota_defs.h"
#include "xfs_quota.h"
-#include "xfs_btree.h"
-#include "xfs_bmap_btree.h"
#include "xfs_reflink.h"
#include "xfs_iomap.h"
#include "xfs_rmap_btree.h"
diff --git a/fs/xfs/xfs_trace.c b/fs/xfs/xfs_trace.c
index 5d95fe3..35f3546 100644
--- a/fs/xfs/xfs_trace.c
+++ b/fs/xfs/xfs_trace.c
@@ -24,7 +24,6 @@
#include "xfs_mount.h"
#include "xfs_defer.h"
#include "xfs_da_format.h"
-#include "xfs_defer.h"
#include "xfs_inode.h"
#include "xfs_btree.h"
#include "xfs_da_btree.h"
--
2.7.4

2017-12-06 18:19:31

by Darrick J. Wong

Subject: Re: [PATCH 22/45] fs: xfs: remove duplicate includes

On Wed, Dec 06, 2017 at 09:46:06PM +0530, Pravin Shedge wrote:
> These duplicate includes have been found with scripts/checkincludes.pl but
> they have been removed manually to avoid removing false positives.
>
> Signed-off-by: Pravin Shedge <[email protected]>

Looks ok, will pick this up.
Reviewed-by: Darrick J. Wong <[email protected]>

> ---
> fs/xfs/scrub/scrub.c | 1 -
> fs/xfs/scrub/trace.c | 1 -
> fs/xfs/xfs_reflink.c | 2 --
> fs/xfs/xfs_trace.c | 1 -
> 4 files changed, 5 deletions(-)
>
> diff --git a/fs/xfs/scrub/scrub.c b/fs/xfs/scrub/scrub.c
> index 9c42c4e..ab3aef2 100644
> --- a/fs/xfs/scrub/scrub.c
> +++ b/fs/xfs/scrub/scrub.c
> @@ -46,7 +46,6 @@
> #include "scrub/scrub.h"
> #include "scrub/common.h"
> #include "scrub/trace.h"
> -#include "scrub/scrub.h"
> #include "scrub/btree.h"
>
> /*
> diff --git a/fs/xfs/scrub/trace.c b/fs/xfs/scrub/trace.c
> index 472080e..86daed0 100644
> --- a/fs/xfs/scrub/trace.c
> +++ b/fs/xfs/scrub/trace.c
> @@ -26,7 +26,6 @@
> #include "xfs_mount.h"
> #include "xfs_defer.h"
> #include "xfs_da_format.h"
> -#include "xfs_defer.h"
> #include "xfs_inode.h"
> #include "xfs_btree.h"
> #include "xfs_trans.h"
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index cc041a2..cf7c8f8 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -49,8 +49,6 @@
> #include "xfs_alloc.h"
> #include "xfs_quota_defs.h"
> #include "xfs_quota.h"
> -#include "xfs_btree.h"
> -#include "xfs_bmap_btree.h"
> #include "xfs_reflink.h"
> #include "xfs_iomap.h"
> #include "xfs_rmap_btree.h"
> diff --git a/fs/xfs/xfs_trace.c b/fs/xfs/xfs_trace.c
> index 5d95fe3..35f3546 100644
> --- a/fs/xfs/xfs_trace.c
> +++ b/fs/xfs/xfs_trace.c
> @@ -24,7 +24,6 @@
> #include "xfs_mount.h"
> #include "xfs_defer.h"
> #include "xfs_da_format.h"
> -#include "xfs_defer.h"
> #include "xfs_inode.h"
> #include "xfs_btree.h"
> #include "xfs_da_btree.h"
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html