[PATCH] janitor: cleanup includes in fs/

From: Randy Hron <rwhron@earthlink.net>

Remove duplicate #includes in fs/
Remove version.h includes where they aren't necessary.
Test compiled on 2.6.0-test5-bk9.

diff --git a/fs/aio.c b/fs/aio.c
index 2f7b979c1e7bb0c60d069644549dd97921608b7c..4e94bb4e7818c3fd04f28ee76b999481b368ef6d 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -25,7 +25,6 @@
 #include <linux/slab.h>
 #include <linux/timer.h>
 #include <linux/aio.h>
-#include <linux/module.h>
 #include <linux/highmem.h>
 #include <linux/workqueue.h>
 

diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
index d2d066519cb342cd99cc2827b836393178c5d9ff..849324bbf3e31d2ef5abeb173994d6d61124b05f 100644 (file)
--- a/fs/binfmt_aout.c
+++ b/fs/binfmt_aout.c
@@ -24,7 +24,6 @@
 #include <linux/binfmts.h>
 #include <linux/personality.h>
 #include <linux/init.h>
-#include <linux/ptrace.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>

diff --git a/fs/char_dev.c b/fs/char_dev.c
index 48f5a6791bec71fa27aedf7d1125bcf2ab18f025..49e5484dfb6a11c6dd7a8d128983510630ca5f1d 100644 (file)
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -11,7 +11,6 @@
 #include <linux/string.h>
 
 #include <linux/major.h>
-#include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/smp_lock.h>

diff --git a/fs/compat.c b/fs/compat.c
index 06891db071be8bf350ef0d127ec6d59cfc511f31..92540b64302abd97e1c254032b88f3fedb16deee 100644 (file)
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -27,7 +27,6 @@
 #include <linux/ioctl32.h>
 #include <linux/init.h>
 #include <linux/sockios.h>     /* for SIOCDEVPRIVATE */
-#include <linux/fs.h>
 #include <linux/smp_lock.h>
 #include <linux/ctype.h>
 #include <linux/module.h>

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index cceb654cf0b34eeee4af7bc91d73e85a4a7a4053..5b458dcf35610dd138c426ef5ebf5c5ffb7f7510 100644 (file)
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -56,12 +56,10 @@
 #include <linux/elevator.h>
 #include <linux/rtc.h>
 #include <linux/pci.h>
-#include <linux/rtc.h>
 #include <linux/module.h>
 #include <linux/serial.h>
 #include <linux/reiserfs_fs.h>
 #include <linux/if_tun.h>
-#include <linux/dirent.h>
 #include <linux/ctype.h>
 #include <linux/ioctl32.h>
 #include <linux/ncp_fs.h>

diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index cdc01a94efd830f92b22c74713b21c44a2975a91..84218906fea22c695a895c6c145e076bfb6faa30 100644 (file)
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -31,7 +31,6 @@
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/suspend.h>
 #include <linux/pagemap.h>
 #include <asm/uaccess.h>

diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c
index 0d521f0dca7b35f8e1cd30b484d98831fafd555a..7fe27b637dda938b92b2290f4505076ab870e1d2 100644 (file)
--- a/fs/jffs/intrep.c
+++ b/fs/jffs/intrep.c
@@ -64,7 +64,6 @@
 #include <linux/pagemap.h>
 #include <asm/semaphore.h>
 #include <asm/byteorder.h>
-#include <linux/version.h>
 #include <linux/smp_lock.h>
 #include <linux/time.h>
 #include <linux/ctype.h>

diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 75aed248cfc87a68de24a2ed3dfb9f76c95fca73..e462866532d8b7c72dd629e2cf8218ac0c57edcb 100644 (file)
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -20,7 +20,6 @@
 #include <linux/highmem.h>
 #include <linux/crc32.h>
 #include <linux/jffs2.h>
-#include <linux/version.h>
 #include "nodelist.h"
 
 extern int generic_file_open(struct inode *, struct file *) __attribute__((weak));

diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 950718806d7a27fa2a7c75fa48117b42e8870c0b..d71073d27b772388a33a062aa420c3ad516753a1 100644 (file)
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -20,7 +20,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/pagemap.h>
 #include <linux/slab.h>
-#include <linux/version.h>
 #include <linux/vfs.h>
 #include "nodelist.h"
 

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 807b5f6c4ee5bfec9941830424a90f36c972ebb7..59adc1f7335b9553923b610e5219154dd48a0c4d 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -15,7 +15,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/smp_lock.h>
-#include <linux/init.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>

diff --git a/fs/smbfs/sock.c b/fs/smbfs/sock.c
index 8e70f349174e2411dbdceaa89ec82802c7167841..4c5fa12c8bd8a6478ec0686adbf51123ab043a45 100644 (file)
--- a/fs/smbfs/sock.c
+++ b/fs/smbfs/sock.c
@@ -20,7 +20,6 @@
 #include <linux/netdevice.h>
 #include <linux/smp_lock.h>
 #include <linux/workqueue.h>
-#include <linux/net.h>
 #include <net/scm.h>
 #include <net/ip.h>