fs: reduce the use of module.h wherever possible

For files only using THIS_MODULE and/or EXPORT_SYMBOL, map
them onto including export.h -- or if the file isn't even
using those, then just delete the include.  Fix up any implicit
include dependencies that were being masked by module.h along
the way.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/fs/aio.c b/fs/aio.c
index 969beb0e22311a4f7e7f4155524709d5dd8269bf..4b5e06390db0325d9f03613cdc68984b84750914 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -13,7 +13,7 @@
 #include <linux/errno.h>
 #include <linux/time.h>
 #include <linux/aio_abi.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/syscalls.h>
 #include <linux/backing-dev.h>
 #include <linux/uio.h>

diff --git a/fs/attr.c b/fs/attr.c
index 95053ad8abccf4de6cd6355577a19bd2ff70ec8f..73f69a6ce9edd380581954f9ce1bc15633bfced0 100644 (file)
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -5,7 +5,7 @@
  *  changes by Thomas Schoebel-Theuer
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/string.h>

diff --git a/fs/bad_inode.c b/fs/bad_inode.c
index 22e9a78872ffec695f8716f0d1158c7e5d394a21..37268c5bb98b2f2061a2e18134ebcdec0544fd9a 100644 (file)
--- a/fs/bad_inode.c
+++ b/fs/bad_inode.c
@@ -9,7 +9,7 @@
  */
 
 #include <linux/fs.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/stat.h>
 #include <linux/time.h>
 #include <linux/namei.h>

diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index 1bffbe0ed7787d96bd8b36cc25d2bd74a1c3572f..3e27232e35748334afdc1c516f48590564819a35 100644 (file)
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -15,7 +15,7 @@
  *     JAN/99 -- coded full program relocation (gerg@snapgear.com)
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>

diff --git a/fs/bio.c b/fs/bio.c
index b980ecde026a3a0e1fca405053572e93ba86c44d..e453924036e96dac3583854cfd45e40699567cfb 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -22,7 +22,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/mempool.h>
 #include <linux/workqueue.h>
 #include <scsi/sg.h>           /* for struct sg_iovec */

diff --git a/fs/buffer.c b/fs/buffer.c
index 1a30db77af3257505eae9706db2c366146666751..70e2017edd70e68c9958d49f1692f3401013df92 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -29,7 +29,7 @@
 #include <linux/file.h>
 #include <linux/quotaops.h>
 #include <linux/highmem.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/writeback.h>
 #include <linux/hash.h>
 #include <linux/suspend.h>

diff --git a/fs/compat.c b/fs/compat.c
index 07880bae28a9fa2128eb5df60c6193c39e099fb8..14483a715bbb304e988a10afb41b7decc3cd63ad 100644 (file)
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -33,7 +33,6 @@
 #include <linux/nfs4_mount.h>
 #include <linux/syscalls.h>
 #include <linux/ctype.h>
-#include <linux/module.h>
 #include <linux/dirent.h>
 #include <linux/fsnotify.h>
 #include <linux/highuid.h>

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index a26bea10e81bae5c9ee1890102ce86b7929bde28..4d3eec7418e3124f5f62e939af0607b8c4aa3d96 100644 (file)
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -49,7 +49,6 @@
 #include <linux/elevator.h>
 #include <linux/rtc.h>
 #include <linux/pci.h>
-#include <linux/module.h>
 #include <linux/serial.h>
 #include <linux/if_tun.h>
 #include <linux/ctype.h>

diff --git a/fs/dcache.c b/fs/dcache.c
index fe19ac13f75f5c4e65ed1afaecd1c5d1ae34ffb6..303ebd98bc8025ee79f3b37db00e81a04b99fad9 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -23,7 +23,7 @@
 #include <linux/init.h>
 #include <linux/hash.h>
 #include <linux/cache.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/mount.h>
 #include <linux/file.h>
 #include <asm/uaccess.h>

diff --git a/fs/dcookies.c b/fs/dcookies.c
index dda0dc702d1b8da82cbe360bba1ffd9f2c6ced46..17c779967828c1e49f6e65291704a54e390b6577 100644 (file)
--- a/fs/dcookies.c
+++ b/fs/dcookies.c
@@ -13,7 +13,7 @@
  */
 
 #include <linux/syscalls.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/list.h>
 #include <linux/mount.h>

diff --git a/fs/eventfd.c b/fs/eventfd.c
index d9a5917739191eb3e3ebda2922ade8546067185b..dba15fecf23e376f12ad2cb367424cf202d3a819 100644 (file)
--- a/fs/eventfd.c
+++ b/fs/eventfd.c
@@ -16,7 +16,7 @@
 #include <linux/spinlock.h>
 #include <linux/anon_inodes.h>
 #include <linux/syscalls.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/kref.h>
 #include <linux/eventfd.h>
 

diff --git a/fs/file.c b/fs/file.c
index 4c6992d8f3ba1e3056645e805ddcb4c879d82f93..3c426de7203a831ba3e107b10eac1a8f8849b72d 100644 (file)
--- a/fs/file.c
+++ b/fs/file.c
@@ -6,7 +6,7 @@
  *  Manage the dynamic fd arrays in the process files_struct.
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 5b4a9362d5aafd7568605b5ec99f862458811ac4..92fcb19e41027acdad6423c0ca558667809f87fc 100644 (file)
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -14,7 +14,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/sched.h>

diff --git a/fs/fs_struct.c b/fs/fs_struct.c
index 78b519c135365fb02d533441377ac4785abcb3ed..a2d1db2ea9840d5067bf3d762f19ffe5f7b99ffd 100644 (file)
--- a/fs/fs_struct.c
+++ b/fs/fs_struct.c
@@ -1,4 +1,4 @@
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/sched.h>
 #include <linux/fs.h>
 #include <linux/path.h>

diff --git a/fs/inode.c b/fs/inode.c
index d3ebdbe723d0d252358d23a75674d184e639dcb0..cd8cffcb75f31ba3a361dcc91e6cb2ff0db43e93 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -8,7 +8,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/writeback.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/backing-dev.h>
 #include <linux/wait.h>
 #include <linux/rwsem.h>

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 066836e818481fb2240d3cc78062fea3a2cee592..29167bebe874049fb847e1f19c2ae220f4ce91f0 100644 (file)
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -10,7 +10,7 @@
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/security.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/uaccess.h>
 #include <linux/writeback.h>
 #include <linux/buffer_head.h>

diff --git a/fs/libfs.c b/fs/libfs.c
index 5b2dbb3ba4fca95f3aab72c39f570c16a61c5c02..001e25be4b65ff68a50185cce945c42b35b0b5cf 100644 (file)
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -3,7 +3,7 @@
  *     Library for filesystems writers.
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/pagemap.h>
 #include <linux/slab.h>
 #include <linux/mount.h>

diff --git a/fs/mpage.c b/fs/mpage.c
index 643e9f55ef297860cbbd52ab48d548e578191846..0face1c4d4c6bd4ea33cb60e45b8c7fad8235acf 100644 (file)
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -13,7 +13,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/mm.h>
 #include <linux/kdev_t.h>
 #include <linux/gfp.h>

diff --git a/fs/namei.c b/fs/namei.c
index a780ea515c47988623fc4954b734562182ed24c5..fa549f27f0191b1602a9ce45f6a7a1ce66711c43 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -15,7 +15,7 @@
  */
 
 #include <linux/init.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/namei.h>

diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index cea4623f1ed63007b8da0a8486ac65595415f895..5e325a42e33d03bb91d32edeb212ac28fb979ec2 100644 (file)
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -18,7 +18,7 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/posix_acl.h>
-#include <linux/module.h>
+#include <linux/export.h>
 
 #include <linux/errno.h>
 

diff --git a/fs/read_write.c b/fs/read_write.c
index 5ad4248b0cd8f00e545ac68d477566a9ea12fdc1..ffc99d22e0a3656711f14ac7e094cc954d1d90bd 100644 (file)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -11,7 +11,7 @@
 #include <linux/uio.h>
 #include <linux/fsnotify.h>
 #include <linux/security.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/syscalls.h>
 #include <linux/pagemap.h>
 #include <linux/splice.h>

diff --git a/fs/readdir.c b/fs/readdir.c
index 356f71528ad6f539a55b1bae149765b7bb6c7d21..cc0a8227cddf688f70e289c427666057ce98e613 100644 (file)
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -6,7 +6,7 @@
 
 #include <linux/stddef.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/time.h>
 #include <linux/mm.h>
 #include <linux/errno.h>

diff --git a/fs/select.c b/fs/select.c
index e782258d0de3cec01c6767aa5cb2b2684e1077ac..de668aa9a098442adabee8e9f111cc68344542f8 100644 (file)
--- a/fs/select.c
+++ b/fs/select.c
@@ -17,7 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/syscalls.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/personality.h> /* for STICKY_TIMEOUTS */

diff --git a/fs/seq_file.c b/fs/seq_file.c
index 4023d6be939bc8521e9afca4094ad96ef8cf3c9f..9f73c6b4436df14543c285afb00e9042288e8c40 100644 (file)
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -6,7 +6,7 @@
  */
 
 #include <linux/fs.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 

diff --git a/fs/splice.c b/fs/splice.c
index 1ec0493266b3783e6af4e053668136d0ec458138..66f4ee013bc25f93ed2ff7b22537135045ce6fde 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -25,7 +25,7 @@
 #include <linux/mm_inline.h>
 #include <linux/swap.h>
 #include <linux/writeback.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/syscalls.h>
 #include <linux/uio.h>
 #include <linux/security.h>

diff --git a/fs/stack.c b/fs/stack.c
index 9c11519245a65296c5de9e5ba3abceb92399fc47..5b5388250e29351a66b60cd7658832586eb80771 100644 (file)
--- a/fs/stack.c
+++ b/fs/stack.c
@@ -1,4 +1,4 @@
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/fs.h>
 #include <linux/fs_stack.h>
 

diff --git a/fs/stat.c b/fs/stat.c
index 8806b8997d2efcfd73944df9f3695d40207fb6bf..c9dfa296b0c31b54351aeb7e323a7aea86532811 100644 (file)
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -4,7 +4,7 @@
  *  Copyright (C) 1991, 1992  Linus Torvalds
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/mm.h>
 #include <linux/errno.h>
 #include <linux/file.h>

diff --git a/fs/statfs.c b/fs/statfs.c
index 2aa6a22e0be230a38dfe13222f03b9a48fcb5713..43e6b6fe4e855684a197c48ed6bb8dee70f95467 100644 (file)
--- a/fs/statfs.c
+++ b/fs/statfs.c
@@ -1,5 +1,5 @@
 #include <linux/syscalls.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/fs.h>
 #include <linux/file.h>
 #include <linux/mount.h>

diff --git a/fs/super.c b/fs/super.c
index 6277ec6cb60a65e71b2c590260c67a057a1748ca..52bfd251b75cba24d0521a7a24a0f5c825e368c7 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -20,7 +20,7 @@
  *  Heavily rewritten for 'one fs - one tree' dcache architecture. AV, Mar 2000
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/acct.h>
 #include <linux/blkdev.h>

diff --git a/fs/sync.c b/fs/sync.c
index f3501ef392354c9a4ae7a13a63b6aa98f6ec9b3f..0e8db939d96f8fdaa072df7e6fcadb15a5781a84 100644 (file)
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -6,7 +6,7 @@
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/namei.h>
 #include <linux/sched.h>
 #include <linux/writeback.h>

diff --git a/fs/xattr.c b/fs/xattr.c
index 82f43376c7cdff1b9acd2b74e31c8e331fb5c307..d6dfd247bb2f4425fdfbd9c57b892a07c3922847 100644 (file)
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -16,7 +16,7 @@
 #include <linux/security.h>
 #include <linux/evm.h>
 #include <linux/syscalls.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/fsnotify.h>
 #include <linux/audit.h>
 #include <asm/uaccess.h>

diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
index 8d5a506c82eb0a16978c4b8065011b412dace2a6..69d06b07b169d183f126497770743cb6dedc8256 100644 (file)
--- a/fs/xattr_acl.c
+++ b/fs/xattr_acl.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2001 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/fs.h>
 #include <linux/posix_acl_xattr.h>
 #include <linux/gfp.h>