[PATCH] pull even more crap out of fs.h

Don't include the following headers implicitly through fs.h:

  stddef.h, string.h, bitops.h, pipe_fs_i.h, ext3_fs_i.h, efs_fs_i.h

and fixup the fallout..

diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index fa8e3b04e1c7140ee4000cfad227b3c6d2599f9c..3bda171c4591c3cdec52613e8e2b07207cf529b3 100644 (file)
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -225,6 +225,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/miscdevice.h>
+#include <linux/bitops.h>
 
 /* The 3.0.0 version of sxboards/sxwindow.h  uses BYTE and WORD.... */
 #define BYTE u8

diff --git a/drivers/net/irda/old_belkin.c b/drivers/net/irda/old_belkin.c
index 28f430ad83bb313a51e055998e288555894fe1af..1ad30691aaa892267619b6f9fad2b7e83255b78f 100644 (file)
--- a/drivers/net/irda/old_belkin.c
+++ b/drivers/net/irda/old_belkin.c
@@ -33,6 +33,7 @@
 #include <linux/tty.h>
 #include <linux/sched.h>
 #include <linux/init.h>
+#include <linux/net.h>
 #include <linux/irda.h>
 
 #include <net/irda/irda.h>

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index a2f0cdf7b671d75db77484faf8cdffb4afd3822e..283998c0c6d57228720d6541ff3c41ee31ccccfe 100644 (file)
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -494,6 +494,7 @@
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 #include <linux/mm.h>
+#include <linux/string.h>
 #include <asm/pgtable.h>
 
 #include <linux/sched.h>

diff --git a/fs/adfs/dir_f.c b/fs/adfs/dir_f.c
index 7560c6cfd8005da485f82da406176dfa810d04f3..b1028793967f1d3731893aaae52f26fa3337b7cb 100644 (file)
--- a/fs/adfs/dir_f.c
+++ b/fs/adfs/dir_f.c
@@ -17,6 +17,7 @@
 #include <linux/stat.h>
 #include <linux/spinlock.h>
 #include <linux/buffer_head.h>
+#include <linux/string.h>
 
 #include "adfs.h"
 #include "dir_f.h"

diff --git a/fs/adfs/dir_fplus.c b/fs/adfs/dir_fplus.c
index fc2ad89a10b10a379aa4138d08183021d7cbf77b..70666ef5943095d28973f8d7924eae1ba2ce63b4 100644 (file)
--- a/fs/adfs/dir_fplus.c
+++ b/fs/adfs/dir_fplus.c
@@ -15,6 +15,7 @@
 #include <linux/stat.h>
 #include <linux/spinlock.h>
 #include <linux/buffer_head.h>
+#include <linux/string.h>
 
 #include "adfs.h"
 #include "dir_fplus.h"

diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c
index bbf0c7872a18d4b40b46928696ae7c983caf41c0..e03b73e5a418d659adb91053bf610f180b29020a 100644 (file)
--- a/fs/befs/datastream.c
+++ b/fs/befs/datastream.c
@@ -14,6 +14,7 @@
 #include <linux/version.h>
 #include <linux/slab.h>
 #include <linux/buffer_head.h>
+#include <linux/string.h>
 
 #include "befs.h"
 #include "datastream.h"

diff --git a/fs/char_dev.c b/fs/char_dev.c
index f86638e5f50710b518fbb691e66dfe128084380e..bacc67cfdda15dd023951f40f67ee6d1efcd9465 100644 (file)
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -8,6 +8,7 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
+#include <linux/string.h>
 
 #define HASH_BITS      6
 #define HASH_SIZE      (1UL << HASH_BITS)

diff --git a/fs/cifs/md5.c b/fs/cifs/md5.c
index 54db3eb1cae35bb17dfd7d75d88e7c992b5f8713..17b5ba21e2222fef3ba6994efefe16e8403a2eb0 100644 (file)
--- a/fs/cifs/md5.c
+++ b/fs/cifs/md5.c
@@ -20,7 +20,7 @@
    and to fit the cifs vfs by 
    Steve French sfrench@us.ibm.com */
 
-#include <linux/fs.h>
+#include <linux/string.h>
 #include "md5.h"
 
 static void MD5Transform(__u32 buf[4], __u32 const in[16]);

diff --git a/fs/fifo.c b/fs/fifo.c
index 68fafe823107dd2e7f39581203af690a0457f5ab..7a6a018303d77c6b5094853a57ba67c58a0ffbe0 100644 (file)
--- a/fs/fifo.c
+++ b/fs/fifo.c
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/fs.h>
+#include <linux/pipe_fs_i.h>
 
 static void wait_for_partner(struct inode* inode, unsigned int* cnt)
 {

diff --git a/fs/freevxfs/vxfs_fshead.c b/fs/freevxfs/vxfs_fshead.c
index 5562a8c0e1ac49fdfe300002cff80667c929e6a9..f0d4e5a7f128187ba2eef8dd189817831d941e77 100644 (file)
--- a/fs/freevxfs/vxfs_fshead.c
+++ b/fs/freevxfs/vxfs_fshead.c
@@ -36,6 +36,7 @@
 #include <linux/buffer_head.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/string.h>
 
 #include "vxfs.h"
 #include "vxfs_inode.h"

diff --git a/fs/pipe.c b/fs/pipe.c
index 057181e2eb746f8bd3c8642c81775b99818282c2..3d7e2cc23c91bbbed6ea6f9be0596de0f0c636cc 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/mount.h>
+#include <linux/pipe_fs_i.h>
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
 

diff --git a/fs/smbfs/cache.c b/fs/smbfs/cache.c
index 687027deea73242527cd840d1ab773815909faad..f3e6b81288abf4b407daa02debcb45b10f35be2a 100644 (file)
--- a/fs/smbfs/cache.c
+++ b/fs/smbfs/cache.c
@@ -16,6 +16,7 @@
 #include <linux/dirent.h>
 #include <linux/smb_fs.h>
 #include <linux/pagemap.h>
+#include <linux/net.h>
 
 #include <asm/page.h>
 

diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c
index 1a74b5585ca28a23f2fe1ebb07bb003c50fa2cd5..fdfcd52a406725877e319da9d25165affdf283c2 100644 (file)
--- a/fs/smbfs/dir.c
+++ b/fs/smbfs/dir.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/smp_lock.h>
 #include <linux/ctype.h>
+#include <linux/net.h>
 
 #include <linux/smb_fs.h>
 #include <linux/smb_mount.h>

diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c
index a3e1f4c8d01f848d1dba850f0cdf51f94021657e..9ded6c19c5f1840acf1f47e27a03ecd41daccd96 100644 (file)
--- a/fs/smbfs/file.c
+++ b/fs/smbfs/file.c
@@ -16,6 +16,7 @@
 #include <linux/slab.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
+#include <linux/net.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>

diff --git a/fs/smbfs/getopt.c b/fs/smbfs/getopt.c
index 626543fb8ac6ee80fd2150679bce67dc6767e21f..7ae0f5273ab170602a03d7672b941a9be1d76c9b 100644 (file)
--- a/fs/smbfs/getopt.c
+++ b/fs/smbfs/getopt.c
@@ -4,6 +4,7 @@
 
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/net.h>
 
 #include "getopt.h"
 

diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
index 9a72a4e84c18bcbb10b7109fa2f276d5fdf0cf71..0c245271124a70cd8bee28322e57e795b35d9ba3 100644 (file)
--- a/fs/smbfs/inode.c
+++ b/fs/smbfs/inode.c
@@ -23,6 +23,7 @@
 #include <linux/nls.h>
 #include <linux/seq_file.h>
 #include <linux/mount.h>
+#include <linux/net.h>
 
 #include <linux/smb_fs.h>
 #include <linux/smbno.h>

diff --git a/fs/smbfs/ioctl.c b/fs/smbfs/ioctl.c
index c9ede0b72a3e4d0c0e0a4f09a575ff9cb3fc61c8..235f583d953c86b021a17c6c85f6557671dffa4f 100644 (file)
--- a/fs/smbfs/ioctl.c
+++ b/fs/smbfs/ioctl.c
@@ -13,6 +13,7 @@
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/highuid.h>
+#include <linux/net.h>
 
 #include <linux/smb_fs.h>
 #include <linux/smb_mount.h>

diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c
index 39827741a220b587bfaa48e7a766b8ff27f72f25..15233411240b0b0bf901fde7955ca28971e40823 100644 (file)
--- a/fs/smbfs/proc.c
+++ b/fs/smbfs/proc.c
@@ -18,6 +18,7 @@
 #include <linux/dirent.h>
 #include <linux/nls.h>
 #include <linux/smp_lock.h>
+#include <linux/net.h>
 
 #include <linux/smb_fs.h>
 #include <linux/smbno.h>

diff --git a/fs/smbfs/request.c b/fs/smbfs/request.c
index 34a0e66c31b7ff4055ef46b8dce658a50faf054e..c4cd9ddc3ffc30d05c69c84fb61addeb7265adc5 100644 (file)
--- a/fs/smbfs/request.c
+++ b/fs/smbfs/request.c
@@ -9,6 +9,7 @@
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
+#include <linux/net.h>
 
 #include <linux/smb_fs.h>
 #include <linux/smbno.h>

diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c
index 2bccb64481c2a2013a7064b17be93cfcfad34447..5f7d1d5969fecbf8f060a129460ac4789045f9e7 100644 (file)
--- a/fs/smbfs/smbiod.c
+++ b/fs/smbfs/smbiod.c
@@ -19,6 +19,7 @@
 #include <linux/dcache.h>
 #include <linux/smp_lock.h>
 #include <linux/module.h>
+#include <linux/net.h>
 #include <net/ip.h>
 
 #include <linux/smb_fs.h>

diff --git a/fs/smbfs/sock.c b/fs/smbfs/sock.c
index 6125f1b227e674dec711efd2c3ceeb7a710cce20..7cfd942b1c468015cbdba61ddef4b6dddee3a836 100644 (file)
--- a/fs/smbfs/sock.c
+++ b/fs/smbfs/sock.c
@@ -20,6 +20,7 @@
 #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>
 

diff --git a/fs/smbfs/symlink.c b/fs/smbfs/symlink.c
index 83df2e7758626b34ef98ccae8910fb69efa9e05f..44d6f58b07416bc803a9242dba30bfebec90b89b 100644 (file)
--- a/fs/smbfs/symlink.c
+++ b/fs/smbfs/symlink.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
+#include <linux/net.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>

diff --git a/fs/sysv/balloc.c b/fs/sysv/balloc.c
index 703f7a2d4d73a3f7c93b6dd745091530cb4e8913..8184570f29b495ab97f7507ef188115fbcefaa80 100644 (file)
--- a/fs/sysv/balloc.c
+++ b/fs/sysv/balloc.c
@@ -20,6 +20,7 @@
  */
 
 #include <linux/buffer_head.h>
+#include <linux/string.h>
 #include "sysv.h"
 
 /* We don't trust the value of

diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c
index 924583dfb5a7e9c456bc658adf0c51ea6f589387..55e7ff30ed709d514d42043cbc33ff6cc3f7fae4 100644 (file)
--- a/fs/sysv/itree.c
+++ b/fs/sysv/itree.c
@@ -7,6 +7,7 @@
 
 #include <linux/buffer_head.h>
 #include <linux/mount.h>
+#include <linux/string.h>
 #include "sysv.h"
 
 enum {DIRECT = 10, DEPTH = 4}; /* Have triple indirect */

diff --git a/include/linux/amigaffs.h b/include/linux/amigaffs.h
index 01afc53427b41dea8be34f7b7b4419ce3060cfde..4c8df68e48e2339d68d4db6def6fca32b4527dbe 100644 (file)
--- a/include/linux/amigaffs.h
+++ b/include/linux/amigaffs.h
@@ -3,6 +3,7 @@
 
 #include <linux/types.h>
 #include <linux/buffer_head.h>
+#include <linux/string.h>
 #include <asm/byteorder.h>
 
 /* AmigaOS allows file names with up to 30 characters length.

diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 458326125d02cbcc4c7cf2bdf332d80c9977a0f0..634459be7d64e9ce091fa36576186e36d6d00591 100644 (file)
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -17,6 +17,7 @@
 #define _LINUX_EXT3_FS_H
 
 #include <linux/types.h>
+#include <linux/ext3_fs_i.h>
 #include <linux/ext3_fs_sb.h>
 
 /*

diff --git a/include/linux/fs.h b/include/linux/fs.h
index b91ec8e200deb0525be993efd9ae3358459a0eba..5868c228e2f11cbd2b95c5870e8ef77ba6817855 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -18,16 +18,13 @@
 #include <linux/dcache.h>
 #include <linux/stat.h>
 #include <linux/cache.h>
-#include <linux/stddef.h>
-#include <linux/string.h>
 #include <linux/radix-tree.h>
-#include <linux/bitops.h>
-
 #include <asm/atomic.h>
 
-struct poll_table_struct;
 struct iovec;
 struct nameidata;
+struct pipe_inode_info;
+struct poll_table_struct;
 struct vm_area_struct;
 struct vfsmount;
 
@@ -220,9 +217,6 @@ typedef int (get_blocks_t)(struct inode *inode, sector_t iblock,
                        unsigned long max_blocks,
                        struct buffer_head *bh_result, int create);
 
-#include <linux/pipe_fs_i.h>
-/* #include <linux/umsdos_fs_i.h> */
-
 /*
  * Attribute flags.  These should be or-ed together to figure out what
  * has been changed!
@@ -415,8 +409,6 @@ struct inode {
 
 /* will die */
 #include <linux/coda_fs_i.h>
-#include <linux/ext3_fs_i.h>
-#include <linux/efs_fs_i.h>
 
 struct fown_struct {
        rwlock_t lock;          /* protects pid, uid, euid fields */

diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
index 3be6cff6d0701ea5fafcb160a8df40d937506b3f..1cb5e7d2b3d7627452337dca425582fc02396c0c 100644 (file)
--- a/include/linux/msdos_fs.h
+++ b/include/linux/msdos_fs.h
@@ -5,6 +5,7 @@
  * The MS-DOS filesystem constants/structures
  */
 #include <linux/buffer_head.h>
+#include <linux/string.h>
 #include <asm/byteorder.h>
 
 #define SECTOR_SIZE    512             /* sector size (bytes) */

diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h
index 9febc18c6a85f1609238a930c1af6f0754e0dd05..368a522782e2d373b82bd5c55ba3c881ab00ab48 100644 (file)
--- a/include/linux/ncp_fs_sb.h
+++ b/include/linux/ncp_fs_sb.h
@@ -10,6 +10,7 @@
 
 #include <linux/types.h>
 #include <linux/ncp_mount.h>
+#include <linux/net.h>
 
 #ifdef __KERNEL__
 

diff --git a/init/initramfs.c b/init/initramfs.c
index 69df592e13553f369dd29fe40069e24d62a21466..b171e36280298cabbe47625fdb948e1ba5ddb0f9 100644 (file)
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -6,6 +6,7 @@
 #include <linux/fcntl.h>
 #include <linux/unistd.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 static void __init error(char *x)
 {