pull even more crap out of fs.h

PATCH New Christoph Hellwig 1 participant 1 message Nov 17, 2002

Subsystems (6)

Network drivers VFS SCSI Char and misc drivers +2 more subsystems

lore

Share & tools

lore

Christoph Hellwig

author

2002-11-17 22:21 UTC #0 lore raw

PATCH 1/1 pull even more crap out of fs.h

[this time tested with acme's monster .config that takes
hours to compile..]

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..

drivers/char/raw.c +1 -1

@@ -15,7 +15,7 @@
 #include <linux/module.h>
 #include <linux/raw.h>
 #include <linux/capability.h>
-
+#include <linux/uio.h>
 #include <asm/uaccess.h>
 
 struct raw_device_data {

===== drivers/char/sx.c 1.13 vs edited =====

drivers/char/sx.c +1 -0

@@ -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

===== drivers/net/irda/old_belkin.c 1.3 vs edited =====

drivers/net/irda/old_belkin.c +1 -0

@@ -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>

===== drivers/scsi/megaraid.c 1.27 vs edited =====

drivers/scsi/megaraid.c +1 -0

@@ -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>

===== fs/char_dev.c 1.4 vs edited =====

fs/char_dev.c +1 -0

@@ -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)

===== fs/fifo.c 1.5 vs edited =====

fs/fifo.c +1 -0

@@ -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)
 {

===== fs/pipe.c 1.23 vs edited =====

fs/pipe.c +1 -0

@@ -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>

===== fs/adfs/dir_f.c 1.6 vs edited =====

fs/adfs/dir_f.c +1 -0

@@ -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"

===== fs/adfs/dir_fplus.c 1.6 vs edited =====

fs/adfs/dir_fplus.c +1 -0

@@ -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"

===== fs/befs/datastream.c 1.1 vs edited =====

fs/befs/datastream.c +1 -0

@@ -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"

===== fs/cifs/md5.c 1.1 vs edited =====

fs/cifs/md5.c +1 -1

@@ -20,7 +20,7 @@
    and to fit the cifs vfs by 
    Steve French [email protected] */
 
-#include <linux/fs.h>
+#include <linux/string.h>
 #include "md5.h"
 
 static void MD5Transform(__u32 buf[4], __u32 const in[16]);

===== fs/freevxfs/vxfs_fshead.c 1.5 vs edited =====

fs/freevxfs/vxfs_fshead.c +1 -0

@@ -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"

===== fs/smbfs/cache.c 1.9 vs edited =====

fs/smbfs/cache.c +1 -0

@@ -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>

===== fs/smbfs/dir.c 1.20 vs edited =====

fs/smbfs/dir.c +1 -0

@@ -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>

===== fs/smbfs/file.c 1.19 vs edited =====

fs/smbfs/file.c +1 -0

@@ -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>

===== fs/smbfs/getopt.c 1.3 vs edited =====

fs/smbfs/getopt.c +1 -0

@@ -4,6 +4,7 @@
 
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/net.h>
 
 #include "getopt.h"

===== fs/smbfs/inode.c 1.34 vs edited =====

fs/smbfs/inode.c +1 -0

@@ -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>

===== fs/smbfs/ioctl.c 1.6 vs edited =====

fs/smbfs/ioctl.c +1 -0

@@ -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>

===== fs/smbfs/proc.c 1.24 vs edited =====

fs/smbfs/proc.c +1 -0

@@ -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>

===== fs/smbfs/request.c 1.2 vs edited =====

fs/smbfs/request.c +1 -0

@@ -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>

===== fs/smbfs/smbiod.c 1.4 vs edited =====

fs/smbfs/smbiod.c +1 -0

@@ -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>

===== fs/smbfs/sock.c 1.12 vs edited =====

fs/smbfs/sock.c +1 -0

@@ -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>

===== fs/smbfs/symlink.c 1.2 vs edited =====

fs/smbfs/symlink.c +1 -0

@@ -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>

===== fs/sysv/balloc.c 1.9 vs edited =====

fs/sysv/balloc.c +1 -0

@@ -20,6 +20,7 @@
  */
 
 #include <linux/buffer_head.h>
+#include <linux/string.h>
 #include "sysv.h"
 
 /* We don't trust the value of

===== fs/sysv/itree.c 1.16 vs edited =====

fs/sysv/itree.c +1 -0

@@ -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 */

===== include/linux/amigaffs.h 1.11 vs edited =====

include/linux/amigaffs.h +1 -0

@@ -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.

===== include/linux/ext3_fs.h 1.19 vs edited =====

include/linux/ext3_fs.h +1 -0

@@ -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>
 
 /*

===== include/linux/fs.h 1.192 vs edited =====

include/linux/fs.h +2 ~~-10~~

@@ -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 +220,6 @@
 			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 +412,6 @@
 
 /* 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 */

===== include/linux/msdos_fs.h 1.20 vs edited =====

include/linux/msdos_fs.h +1 -0

@@ -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) */

===== include/linux/ncp_fs_sb.h 1.5 vs edited =====

include/linux/ncp_fs_sb.h +1 -0

@@ -10,6 +10,7 @@
 
 #include <linux/types.h>
 #include <linux/ncp_mount.h>
+#include <linux/net.h>
 
 #ifdef __KERNEL__

===== init/initramfs.c 1.4 vs edited =====

init/initramfs.c +1 -0

@@ -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)
 {