xfs
[Top] [All Lists]

[patch] remove extra includes in fs/xfs

To: linux-xfs@xxxxxxxxxxx
Subject: [patch] remove extra includes in fs/xfs
From: rwhron@xxxxxxxxxxxxx
Date: Sun, 7 Sep 2003 22:03:02 -0400
Sender: linux-xfs-bounce@xxxxxxxxxxx
User-agent: Mutt/1.4.1i
/usr/src/linux/scripts/checkincludes.pl shows headers
included more than once.  It can be run by:

chmod +x scripts/checkincludes.pl
find fs/xfs | xargs scripts/checkincludes.pl

On 2.6.0-test4-bk9 it produces:

fs/xfs/xfs_fsops.c: xfs_dir.h is included more than once.
fs/xfs/xfsidbg.c: xfs_log_recover.h is included more than once.
fs/xfs/xfs_log_recover.c: xfs_error.h is included more than once.
fs/xfs/xfs_trans_ail.c: xfs_log.h is included more than once.
fs/xfs/xfs_vfsops.c: xfs_dmapi.h is included more than once.
fs/xfs/xfs_vfsops.c: xfs_alloc.h is included more than once.
fs/xfs/xfs_iocore.c: xfs_dmapi.h is included more than once.
fs/xfs/xfs_bmap.c: xfs_dmapi.h is included more than once.
fs/xfs/xfs_dir2.c: xfs_dir2_sf.h is included more than once.
fs/xfs/xfs_vnodeops.c: xfs_dmapi.h is included more than once.
fs/xfs/xfs_rename.c: xfs_dmapi.h is included more than once.
fs/xfs/xfs_rw.c: xfs_attr.h is included more than once.

Patch below tested against 2.6.0-test4-bk9.


diff -u linux/fs/xfs/xfs_bmap.c linux-2.6.0-test4-bk9/fs/xfs/xfs_bmap.c
--- linux/fs/xfs/xfs_bmap.c     2003-08-22 21:19:56.000000000 -0400
+++ linux-2.6.0-test4-bk9/fs/xfs/xfs_bmap.c     2003-09-07 21:44:49.000000000 
-0400
@@ -52,7 +52,6 @@
 #include "xfs_dir_sf.h"
 #include "xfs_dir2_sf.h"
 #include "xfs_dinode.h"
-#include "xfs_dmapi.h"
 #include "xfs_inode_item.h"
 #include "xfs_inode.h"
 #include "xfs_itable.h"
diff -u linux/fs/xfs/xfs_dir2.c linux-2.6.0-test4-bk9/fs/xfs/xfs_dir2.c
--- linux/fs/xfs/xfs_dir2.c     2003-05-06 21:42:30.000000000 -0400
+++ linux-2.6.0-test4-bk9/fs/xfs/xfs_dir2.c     2003-09-07 21:45:09.000000000 
-0400
@@ -63,7 +63,6 @@
 #include "xfs_dir2_leaf.h"
 #include "xfs_dir2_block.h"
 #include "xfs_dir2_node.h"
-#include "xfs_dir2_sf.h"
 #include "xfs_dir2_trace.h"
 #include "xfs_error.h"
 #include "xfs_bit.h"
diff -u linux/fs/xfs/xfs_fsops.c linux-2.6.0-test4-bk9/fs/xfs/xfs_fsops.c
--- linux/fs/xfs/xfs_fsops.c    2003-05-06 21:42:30.000000000 -0400
+++ linux-2.6.0-test4-bk9/fs/xfs/xfs_fsops.c    2003-09-07 21:41:37.000000000 
-0400
@@ -53,7 +53,6 @@
 #include "xfs_rw.h"
 #include "xfs_trans_space.h"
 #include "xfs_rtalloc.h"
-#include "xfs_dir.h"
 #include "xfs_dir2.h"
 #include "xfs_attr_sf.h"
 #include "xfs_dir_sf.h"
diff -u linux/fs/xfs/xfs_iocore.c linux-2.6.0-test4-bk9/fs/xfs/xfs_iocore.c
--- linux/fs/xfs/xfs_iocore.c   2003-07-02 18:42:34.000000000 -0400
+++ linux-2.6.0-test4-bk9/fs/xfs/xfs_iocore.c   2003-09-07 21:44:36.000000000 
-0400
@@ -61,7 +61,6 @@
 #include "xfs_rw.h"
 #include "xfs_quota.h"
 #include "xfs_trans_space.h"
-#include "xfs_dmapi.h"
 
 
 STATIC xfs_fsize_t
diff -u linux/fs/xfs/xfs_log_recover.c 
linux-2.6.0-test4-bk9/fs/xfs/xfs_log_recover.c
--- linux/fs/xfs/xfs_log_recover.c      2003-08-22 21:19:56.000000000 -0400
+++ linux-2.6.0-test4-bk9/fs/xfs/xfs_log_recover.c      2003-09-07 
21:42:34.000000000 -0400
@@ -54,7 +54,6 @@
 #include "xfs_inode.h"
 #include "xfs_ialloc_btree.h"
 #include "xfs_ialloc.h"
-#include "xfs_error.h"
 #include "xfs_log_priv.h"
 #include "xfs_buf_item.h"
 #include "xfs_alloc_btree.h"
diff -u linux/fs/xfs/xfs_rename.c linux-2.6.0-test4-bk9/fs/xfs/xfs_rename.c
--- linux/fs/xfs/xfs_rename.c   2003-05-06 21:42:30.000000000 -0400
+++ linux-2.6.0-test4-bk9/fs/xfs/xfs_rename.c   2003-09-07 21:45:45.000000000 
-0400
@@ -56,7 +56,6 @@
 #include "xfs_trans_space.h"
 #include "xfs_da_btree.h"
 #include "xfs_dir_leaf.h"
-#include "xfs_dmapi.h"
 
 
 /*
diff -u linux/fs/xfs/xfs_rw.c linux-2.6.0-test4-bk9/fs/xfs/xfs_rw.c
--- linux/fs/xfs/xfs_rw.c       2003-05-06 21:42:30.000000000 -0400
+++ linux-2.6.0-test4-bk9/fs/xfs/xfs_rw.c       2003-09-07 21:45:57.000000000 
-0400
@@ -59,7 +59,6 @@
 #include "xfs_bmap.h"
 #include "xfs_acl.h"
 #include "xfs_mac.h"
-#include "xfs_attr.h"
 #include "xfs_error.h"
 #include "xfs_buf_item.h"
 #include "xfs_rw.h"
diff -u linux/fs/xfs/xfs_trans_ail.c 
linux-2.6.0-test4-bk9/fs/xfs/xfs_trans_ail.c
--- linux/fs/xfs/xfs_trans_ail.c        2003-05-06 21:42:30.000000000 -0400
+++ linux-2.6.0-test4-bk9/fs/xfs/xfs_trans_ail.c        2003-09-07 
21:43:46.000000000 -0400
@@ -40,7 +40,6 @@
 #include "xfs_dir.h"
 #include "xfs_dmapi.h"
 #include "xfs_mount.h"
-#include "xfs_log.h"
 #include "xfs_trans_priv.h"
 #include "xfs_error.h"
 
diff -u linux/fs/xfs/xfs_vfsops.c linux-2.6.0-test4-bk9/fs/xfs/xfs_vfsops.c
--- linux/fs/xfs/xfs_vfsops.c   2003-08-22 21:19:56.000000000 -0400
+++ linux-2.6.0-test4-bk9/fs/xfs/xfs_vfsops.c   2003-09-07 21:44:20.000000000 
-0400
@@ -49,7 +49,6 @@
 #include "xfs_btree.h"
 #include "xfs_alloc.h"
 #include "xfs_ialloc.h"
-#include "xfs_alloc.h"
 #include "xfs_attr_sf.h"
 #include "xfs_dir_sf.h"
 #include "xfs_dir2_sf.h"
@@ -64,7 +63,6 @@
 #include "xfs_buf_item.h"
 #include "xfs_extfree_item.h"
 #include "xfs_quota.h"
-#include "xfs_dmapi.h"
 #include "xfs_dir2_trace.h"
 #include "xfs_acl.h"
 #include "xfs_attr.h"
diff -u linux/fs/xfs/xfs_vnodeops.c linux-2.6.0-test4-bk9/fs/xfs/xfs_vnodeops.c
--- linux/fs/xfs/xfs_vnodeops.c 2003-08-22 21:19:56.000000000 -0400
+++ linux-2.6.0-test4-bk9/fs/xfs/xfs_vnodeops.c 2003-09-07 21:45:32.000000000 
-0400
@@ -66,7 +66,6 @@
 #include "xfs_utils.h"
 #include "xfs_trans_space.h"
 #include "xfs_dir_leaf.h"
-#include "xfs_dmapi.h"
 #include "xfs_mac.h"
 #include "xfs_log_priv.h"
 
diff -u linux/fs/xfs/xfsidbg.c linux-2.6.0-test4-bk9/fs/xfs/xfsidbg.c
--- linux/fs/xfs/xfsidbg.c      2003-09-07 20:22:27.000000000 -0400
+++ linux-2.6.0-test4-bk9/fs/xfs/xfsidbg.c      2003-09-07 21:42:00.000000000 
-0400
@@ -78,7 +78,6 @@
 #include "xfs_rw.h"
 #include "xfs_bit.h"
 #include "xfs_quota.h"
-#include "xfs_log_recover.h"
 #include "quota/xfs_qm.h"
 
 MODULE_AUTHOR("Silicon Graphics, Inc.");

-- 
Randy Hron
http://home.earthlink.net/~rwhron/kernel/bigbox.html



<Prev in Thread] Current Thread [Next in Thread>