From bd2b0c85edfa015fdb4990ad07ad10e94ea885a4 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sun, 19 May 2002 19:40:16 -0700 Subject: [PATCH] get rid of The lock.h header contained some hand-crafted lcoking routines from the pre-SMP days. In 2.5 only lock_super/unlock_super are left, guarded by a number of completly unrelated (!) includes. This patch moves lock_super/unlock_super to fs.h, which defined struct super_block that is needed for those to operate it, removes locks.h and updates all caller to not include it and add the missing, previously nested includes where needed. --- drivers/block/DAC960.c | 1 - drivers/block/block_ioctl.c | 1 - drivers/block/cpqarray.h | 1 - drivers/block/ll_rw_blk.c | 1 - drivers/isdn/capi/capifs.c | 1 - drivers/isdn/capi/kcapi.c | 1 - drivers/md/lvm.c | 1 - drivers/md/raid5.c | 1 - drivers/media/video/i2c-old.c | 1 - fs/adfs/inode.c | 1 - fs/adfs/super.c | 1 - fs/affs/amigaffs.c | 1 - fs/affs/bitmap.c | 1 - fs/affs/file.c | 1 - fs/affs/inode.c | 1 - fs/affs/namei.c | 1 - fs/affs/super.c | 1 - fs/autofs/inode.c | 1 - fs/autofs4/inode.c | 2 +- fs/bfs/dir.c | 1 - fs/bfs/file.c | 1 - fs/bfs/inode.c | 1 - fs/binfmt_em86.c | 1 - fs/block_dev.c | 1 - fs/buffer.c | 1 - fs/coda/cache.c | 1 - fs/coda/coda_linux.c | 1 - fs/coda/dir.c | 1 - fs/coda/file.c | 1 - fs/coda/inode.c | 1 - fs/coda/pioctl.c | 1 - fs/coda/symlink.c | 2 +- fs/coda/upcall.c | 1 - fs/cramfs/inode.c | 1 - fs/devpts/inode.c | 1 - fs/efs/super.c | 1 - fs/ext2/balloc.c | 1 - fs/ext2/fsync.c | 1 - fs/ext2/ialloc.c | 1 - fs/ext2/inode.c | 2 +- fs/ext2/super.c | 1 - fs/ext3/balloc.c | 1 - fs/ext3/file.c | 1 - fs/ext3/ialloc.c | 1 - fs/ext3/inode.c | 5 +++-- fs/ext3/namei.c | 1 - fs/ext3/super.c | 1 - fs/fat/file.c | 1 - fs/fat/inode.c | 2 +- fs/hpfs/file.c | 1 + fs/hpfs/hpfs_fn.h | 1 - fs/hpfs/inode.c | 1 + fs/hpfs/namei.c | 1 + fs/intermezzo/cache.c | 1 - fs/intermezzo/dcache.c | 1 - fs/intermezzo/dir.c | 1 - fs/intermezzo/ext_attr.c | 1 - fs/intermezzo/file.c | 1 - fs/intermezzo/inode.c | 2 -- fs/intermezzo/journal.c | 1 - fs/intermezzo/journal_ext2.c | 1 - fs/intermezzo/journal_ext3.c | 1 - fs/intermezzo/journal_obdfs.c | 1 - fs/intermezzo/journal_reiserfs.c | 1 - fs/intermezzo/journal_xfs.c | 1 - fs/intermezzo/methods.c | 1 - fs/intermezzo/presto.c | 1 - fs/intermezzo/super.c | 1 - fs/intermezzo/upcall.c | 1 - fs/isofs/compress.c | 1 - fs/isofs/dir.c | 1 - fs/isofs/inode.c | 1 - fs/jbd/checkpoint.c | 1 - fs/jbd/commit.c | 1 - fs/jbd/journal.c | 2 +- fs/jbd/recovery.c | 1 - fs/jbd/revoke.c | 1 - fs/jbd/transaction.c | 2 +- fs/jffs/inode-v23.c | 1 - fs/jffs/intrep.c | 1 - fs/jfs/file.c | 1 - fs/jfs/inode.c | 1 - fs/jfs/jfs_dtree.c | 1 - fs/jfs/jfs_imap.c | 1 - fs/jfs/jfs_logmgr.c | 1 - fs/jfs/jfs_txnmgr.c | 1 - fs/jfs/jfs_xtree.c | 1 - fs/jfs/namei.c | 1 - fs/jfs/super.c | 1 - fs/minix/inode.c | 1 - fs/minix/itree_v1.c | 1 - fs/minix/itree_v2.c | 1 - fs/ncpfs/dir.c | 1 - fs/ncpfs/file.c | 1 - fs/ncpfs/inode.c | 1 - fs/nfs/inode.c | 1 - fs/nfsd/nfs3proc.c | 1 - fs/nfsd/nfsproc.c | 1 - fs/nfsd/vfs.c | 1 - fs/ntfs/aops.c | 1 - fs/ntfs/compress.c | 1 - fs/ntfs/mft.c | 1 - fs/ntfs/super.c | 1 - fs/openpromfs/inode.c | 1 - fs/proc/inode.c | 1 - fs/qnx4/fsync.c | 1 - fs/qnx4/inode.c | 2 +- fs/qnx4/truncate.c | 1 - fs/ramfs/inode.c | 1 - fs/reiserfs/bitmap.c | 1 - fs/reiserfs/buffer2.c | 1 - fs/reiserfs/fix_node.c | 1 - fs/reiserfs/inode.c | 2 +- fs/reiserfs/ioctl.c | 2 +- fs/reiserfs/journal.c | 1 - fs/reiserfs/objectid.c | 1 - fs/reiserfs/procfs.c | 1 - fs/reiserfs/resize.c | 1 - fs/reiserfs/stree.c | 1 - fs/reiserfs/super.c | 1 - fs/reiserfs/tail_conversion.c | 1 - fs/romfs/inode.c | 2 +- fs/smbfs/inode.c | 1 - fs/super.c | 1 - fs/sysv/balloc.c | 1 - fs/sysv/ialloc.c | 2 +- fs/sysv/inode.c | 1 - fs/sysv/itree.c | 1 - fs/udf/balloc.c | 1 - fs/udf/file.c | 2 +- fs/udf/fsync.c | 1 - fs/udf/ialloc.c | 1 - fs/udf/inode.c | 2 +- fs/udf/namei.c | 1 - fs/udf/super.c | 1 - fs/ufs/balloc.c | 1 - fs/ufs/cylinder.c | 1 - fs/ufs/dir.c | 1 - fs/ufs/file.c | 1 - fs/ufs/ialloc.c | 1 - fs/ufs/inode.c | 1 - fs/ufs/super.c | 1 - fs/ufs/truncate.c | 1 - fs/ufs/util.c | 1 - include/linux/amigaffs.h | 1 - include/linux/blk.h | 1 - include/linux/fs.h | 13 +++++++++++++ include/linux/hfs_sysdep.h | 2 +- include/linux/locks.h | 28 ---------------------------- include/linux/nbd.h | 1 - include/linux/raid/md.h | 1 - include/linux/swap.h | 1 + include/linux/ufs_fs.h | 1 + kernel/ksyms.c | 1 - mm/page_io.c | 2 +- mm/shmem.c | 1 - net/khttpd/datasending.c | 1 - 157 files changed, 36 insertions(+), 180 deletions(-) delete mode 100644 include/linux/locks.h diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 7ba55877b5a9..b539b367cbc7 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/block/block_ioctl.c b/drivers/block/block_ioctl.c index 6c204d48ea53..7801e021c1bf 100644 --- a/drivers/block/block_ioctl.c +++ b/drivers/block/block_ioctl.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h index 80b4dba8b83e..a6118b3de22b 100644 --- a/drivers/block/cpqarray.h +++ b/drivers/block/cpqarray.h @@ -27,7 +27,6 @@ #ifdef __KERNEL__ #include -#include #include #include #include diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c index 51fd5be00995..0ea76d978992 100644 --- a/drivers/block/ll_rw_blk.c +++ b/drivers/block/ll_rw_blk.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c index f0c79911456f..5021b597997d 100644 --- a/drivers/isdn/capi/capifs.c +++ b/drivers/isdn/capi/capifs.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c index a609563d7c84..e9d33b415ca5 100644 --- a/drivers/isdn/capi/kcapi.c +++ b/drivers/isdn/capi/kcapi.c @@ -26,7 +26,6 @@ printk(KERN_DEBUG __FUNCTION__ ": " format "\n" , ## arg); \ #include #include #include -#include #include #include #include diff --git a/drivers/md/lvm.c b/drivers/md/lvm.c index 1c31e2058143..dfc256c6a2ec 100644 --- a/drivers/md/lvm.c +++ b/drivers/md/lvm.c @@ -212,7 +212,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 8133b7c0952f..9402b0c779b9 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -18,7 +18,6 @@ #include #include -#include #include #include #include diff --git a/drivers/media/video/i2c-old.c b/drivers/media/video/i2c-old.c index 52dc8ebb17d5..bd731be97aa1 100644 --- a/drivers/media/video/i2c-old.c +++ b/drivers/media/video/i2c-old.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c index 8f7403772d0c..fd736d937020 100644 --- a/fs/adfs/inode.c +++ b/fs/adfs/inode.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/adfs/super.c b/fs/adfs/super.c index 55309e14720c..8f59cf69efbf 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c index bc229488cfbf..fb4545696be9 100644 --- a/fs/affs/amigaffs.c +++ b/fs/affs/amigaffs.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include diff --git a/fs/affs/bitmap.c b/fs/affs/bitmap.c index 2ff2854b0d74..b22cadd6e86f 100644 --- a/fs/affs/bitmap.c +++ b/fs/affs/bitmap.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include diff --git a/fs/affs/file.c b/fs/affs/file.c index 86a98ea9d4bf..3d35848490c7 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/affs/inode.c b/fs/affs/inode.c index 39f18dc29465..e831d12f1aeb 100644 --- a/fs/affs/inode.c +++ b/fs/affs/inode.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/affs/namei.c b/fs/affs/namei.c index 80578e97be18..63bcbb7f8162 100644 --- a/fs/affs/namei.c +++ b/fs/affs/namei.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/affs/super.c b/fs/affs/super.c index 01041d693028..68af4188327c 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c index 16f434801863..5a83e2ce5ad1 100644 --- a/fs/autofs/inode.c +++ b/fs/autofs/inode.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include "autofs_i.h" #define __NO_VERSION__ diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index 86f73230fa29..c17dcb637608 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include "autofs_i.h" #define __NO_VERSION__ diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c index c36aff10c3c2..5913276d8d07 100644 --- a/fs/bfs/dir.c +++ b/fs/bfs/dir.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include "bfs_defs.h" diff --git a/fs/bfs/file.c b/fs/bfs/file.c index 6413652035c2..313e5e4009ab 100644 --- a/fs/bfs/file.c +++ b/fs/bfs/file.c @@ -5,7 +5,6 @@ */ #include -#include #include #include #include "bfs_defs.h" diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c index 31823866a9c2..df4cf556785a 100644 --- a/fs/bfs/inode.c +++ b/fs/bfs/inode.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include diff --git a/fs/binfmt_em86.c b/fs/binfmt_em86.c index 8f1a2752feef..d651e875b01e 100644 --- a/fs/binfmt_em86.c +++ b/fs/binfmt_em86.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/block_dev.c b/fs/block_dev.c index 76c5e5cf0555..654d98a256b0 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/buffer.c b/fs/buffer.c index f9923e470bb3..904fec39dd60 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/coda/cache.c b/fs/coda/cache.c index 47f8ebae639e..5e526d018e23 100644 --- a/fs/coda/cache.c +++ b/fs/coda/cache.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/coda/coda_linux.c b/fs/coda/coda_linux.c index c50dae543692..ee14f574233b 100644 --- a/fs/coda/coda_linux.c +++ b/fs/coda/coda_linux.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include diff --git a/fs/coda/dir.c b/fs/coda/dir.c index d18a8ad385bd..40398f8b66c7 100644 --- a/fs/coda/dir.c +++ b/fs/coda/dir.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include diff --git a/fs/coda/file.c b/fs/coda/file.c index f74655873fa8..7d6dd4b5de74 100644 --- a/fs/coda/file.c +++ b/fs/coda/file.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/coda/inode.c b/fs/coda/inode.c index 621074e23410..5066d9a04984 100644 --- a/fs/coda/inode.c +++ b/fs/coda/inode.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c index a6a11d615fcf..edfb9aa96544 100644 --- a/fs/coda/pioctl.c +++ b/fs/coda/pioctl.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #define __NO_VERSION__ #include diff --git a/fs/coda/symlink.c b/fs/coda/symlink.c index eed35ddd28a1..764a64ee8332 100644 --- a/fs/coda/symlink.c +++ b/fs/coda/symlink.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c index f3b8699ad5f1..72700a2dcb3c 100644 --- a/fs/coda/upcall.c +++ b/fs/coda/upcall.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index c9a6374289cd..0e9e2600a6db 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 231bc91cd79d..0727e719279d 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/efs/super.c b/fs/efs/super.c index 4af82d06d5bf..51cca8ecfa9d 100644 --- a/fs/efs/super.c +++ b/fs/efs/super.c @@ -8,7 +8,6 @@ #include #include -#include #include #include #include diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c index 7cb0c303a6ea..985fb0f71bf3 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c @@ -13,7 +13,6 @@ #include #include "ext2.h" -#include #include /* diff --git a/fs/ext2/fsync.c b/fs/ext2/fsync.c index 5ba02176b331..4528b40c31c9 100644 --- a/fs/ext2/fsync.c +++ b/fs/ext2/fsync.c @@ -23,7 +23,6 @@ */ #include "ext2.h" -#include #include diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index aa2f3ad28fe4..be520e2ad23c 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c @@ -14,7 +14,6 @@ #include #include "ext2.h" -#include #include diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 55592347a48c..592db3d7937f 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -23,10 +23,10 @@ */ #include "ext2.h" -#include #include #include #include +#include #include #include diff --git a/fs/ext2/super.c b/fs/ext2/super.c index db59722a8c30..7e162a913b34 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -22,7 +22,6 @@ #include "ext2.h" #include #include -#include #include #include #include diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c index 2da50dce0434..ea4bd4510319 100644 --- a/fs/ext3/balloc.c +++ b/fs/ext3/balloc.c @@ -17,7 +17,6 @@ #include #include #include -#include #include /* diff --git a/fs/ext3/file.c b/fs/ext3/file.c index 3ed85a1adcf8..d5040f1cdbcd 100644 --- a/fs/ext3/file.c +++ b/fs/ext3/file.c @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c index cd57f9f5757d..f190708fd710 100644 --- a/fs/ext3/ialloc.c +++ b/fs/ext3/ialloc.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 6f764bf1eec9..4be6e5eaa4ea 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -22,15 +22,16 @@ * Assorted race fixes, rewrite of ext3_get_block() by Al Viro, 2000 */ +#include #include #include #include #include -#include #include #include +#include #include -#include +#include /* * SEARCH_FROM_ZERO forces each block allocation to search from the start diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index 58e3d8f89b61..2587c77a1d88 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 3ffa9fecf652..1c90e699030a 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/fat/file.c b/fs/fat/file.c index 32a79bfaa66a..ee581867252c 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c @@ -7,7 +7,6 @@ */ #include -#include #include #include #include diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 03fe0dc5b3d9..81568264732c 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -12,11 +12,11 @@ #include #include -#include #include #include #include #include +#include //#include #include diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c index 323e66dd6b08..986e479e433b 100644 --- a/fs/hpfs/file.c +++ b/fs/hpfs/file.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "hpfs_fn.h" #define BLOCKS(size) (((size) + 511) >> 9) diff --git a/fs/hpfs/hpfs_fn.h b/fs/hpfs/hpfs_fn.h index a6cb5a596827..b5c09a1d66c3 100644 --- a/fs/hpfs/hpfs_fn.h +++ b/fs/hpfs/hpfs_fn.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c index 61578e25673e..08125d97bf3a 100644 --- a/fs/hpfs/inode.c +++ b/fs/hpfs/inode.c @@ -6,6 +6,7 @@ * inode VFS functions */ +#include #include #include #include "hpfs_fn.h" diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c index 85ddc8aef4a6..2a54665058f8 100644 --- a/fs/hpfs/namei.c +++ b/fs/hpfs/namei.c @@ -6,6 +6,7 @@ * adding & removing files & directories */ +#include #include #include "hpfs_fn.h" diff --git a/fs/intermezzo/cache.c b/fs/intermezzo/cache.c index 7c3d32d4152f..93a534473ea2 100644 --- a/fs/intermezzo/cache.c +++ b/fs/intermezzo/cache.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/fs/intermezzo/dcache.c b/fs/intermezzo/dcache.c index eca114afc4fa..6e7bd681ae47 100644 --- a/fs/intermezzo/dcache.c +++ b/fs/intermezzo/dcache.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/intermezzo/dir.c b/fs/intermezzo/dir.c index 7617c500c35f..c8a8c1988f16 100644 --- a/fs/intermezzo/dir.c +++ b/fs/intermezzo/dir.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #define __NO_VERSION__ diff --git a/fs/intermezzo/ext_attr.c b/fs/intermezzo/ext_attr.c index 398c6d50554a..3c317baa7911 100644 --- a/fs/intermezzo/ext_attr.c +++ b/fs/intermezzo/ext_attr.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include diff --git a/fs/intermezzo/file.c b/fs/intermezzo/file.c index 68084e55ef73..67c34b7bce4a 100644 --- a/fs/intermezzo/file.c +++ b/fs/intermezzo/file.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/intermezzo/inode.c b/fs/intermezzo/inode.c index 111721845226..ace8cacad054 100644 --- a/fs/intermezzo/inode.c +++ b/fs/intermezzo/inode.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -24,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/intermezzo/journal.c b/fs/intermezzo/journal.c index df8f31533479..049760de033c 100644 --- a/fs/intermezzo/journal.c +++ b/fs/intermezzo/journal.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/intermezzo/journal_ext2.c b/fs/intermezzo/journal_ext2.c index 2a4a5d7b40f9..74888cb0c367 100644 --- a/fs/intermezzo/journal_ext2.c +++ b/fs/intermezzo/journal_ext2.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/intermezzo/journal_ext3.c b/fs/intermezzo/journal_ext3.c index 58ab5f50dccc..46bebc15d30b 100644 --- a/fs/intermezzo/journal_ext3.c +++ b/fs/intermezzo/journal_ext3.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/intermezzo/journal_obdfs.c b/fs/intermezzo/journal_obdfs.c index c6d239b2685e..2ce2d08f73ab 100644 --- a/fs/intermezzo/journal_obdfs.c +++ b/fs/intermezzo/journal_obdfs.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #ifdef CONFIG_OBDFS_FS diff --git a/fs/intermezzo/journal_reiserfs.c b/fs/intermezzo/journal_reiserfs.c index 6531887ad3f5..23804ec54fff 100644 --- a/fs/intermezzo/journal_reiserfs.c +++ b/fs/intermezzo/journal_reiserfs.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #if 0 diff --git a/fs/intermezzo/journal_xfs.c b/fs/intermezzo/journal_xfs.c index 0ec4372e918a..70aad72b613e 100644 --- a/fs/intermezzo/journal_xfs.c +++ b/fs/intermezzo/journal_xfs.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #ifdef CONFIG_FS_XFS diff --git a/fs/intermezzo/methods.c b/fs/intermezzo/methods.c index 05af7f28bdf9..276f4be455cd 100644 --- a/fs/intermezzo/methods.c +++ b/fs/intermezzo/methods.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #define __NO_VERSION__ diff --git a/fs/intermezzo/presto.c b/fs/intermezzo/presto.c index 12243f3e199b..5c8514c2c665 100644 --- a/fs/intermezzo/presto.c +++ b/fs/intermezzo/presto.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/intermezzo/super.c b/fs/intermezzo/super.c index 4a9358f82c07..f1804c2a7860 100644 --- a/fs/intermezzo/super.c +++ b/fs/intermezzo/super.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #define __NO_VERSION__ diff --git a/fs/intermezzo/upcall.c b/fs/intermezzo/upcall.c index 37491a4c3dd0..604705413305 100644 --- a/fs/intermezzo/upcall.c +++ b/fs/intermezzo/upcall.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c index 4ce2fb2a5f96..a5728e0f7d6a 100644 --- a/fs/isofs/compress.c +++ b/fs/isofs/compress.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c index 19a643b650e6..610462dd9cc9 100644 --- a/fs/isofs/dir.c +++ b/fs/isofs/dir.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index 08d4a148495b..9058e9763e88 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c index d809febc5abc..17a94591d021 100644 --- a/fs/jbd/checkpoint.c +++ b/fs/jbd/checkpoint.c @@ -22,7 +22,6 @@ #include #include #include -#include extern spinlock_t journal_datalist_lock; diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 59c3b994d47a..e4ce53b05a55 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c @@ -18,7 +18,6 @@ #include #include #include -#include #include extern spinlock_t journal_datalist_lock; diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index baafedb4afa5..a89f7e547581 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c @@ -28,11 +28,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c index 48af2d532d0d..e6a96d3c30ce 100644 --- a/fs/jbd/recovery.c +++ b/fs/jbd/recovery.c @@ -21,7 +21,6 @@ #include #include #include -#include #endif /* diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c index 464e828db9d1..7cecb0237988 100644 --- a/fs/jbd/revoke.c +++ b/fs/jbd/revoke.c @@ -65,7 +65,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 2245e396ebd9..cf10a8ce12e3 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c @@ -22,10 +22,10 @@ #include #include #include -#include #include #include #include +#include extern spinlock_t journal_datalist_lock; diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c index 3e11c2dd55b8..fe077a51775e 100644 --- a/fs/jffs/inode-v23.c +++ b/fs/jffs/inode-v23.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/jffs/intrep.c b/fs/jffs/intrep.c index ec26515ce2b4..cc3f7895b294 100644 --- a/fs/jffs/intrep.c +++ b/fs/jffs/intrep.c @@ -63,7 +63,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/jfs/file.c b/fs/jfs/file.c index b926fb7ffacd..ec8ea1484ff5 100644 --- a/fs/jfs/file.c +++ b/fs/jfs/file.c @@ -17,7 +17,6 @@ */ #include -#include #include "jfs_incore.h" #include "jfs_txnmgr.h" #include "jfs_debug.h" diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c index eb34bd53ff04..032d52434350 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c @@ -17,7 +17,6 @@ */ #include -#include #include "jfs_incore.h" #include "jfs_filsys.h" #include "jfs_imap.h" diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c index 9742962de44f..1b223e2275ad 100644 --- a/fs/jfs/jfs_dtree.c +++ b/fs/jfs/jfs_dtree.c @@ -101,7 +101,6 @@ */ #include -#include #include #include "jfs_incore.h" #include "jfs_superblock.h" diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c index 9360c94d857f..becd4caa108a 100644 --- a/fs/jfs/jfs_imap.c +++ b/fs/jfs/jfs_imap.c @@ -42,7 +42,6 @@ */ #include -#include #include "jfs_incore.h" #include "jfs_filsys.h" #include "jfs_dinode.h" diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index a2e91a853516..219d5dbb2d18 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c @@ -59,7 +59,6 @@ */ #include -#include #include #include #include diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c index 47b4b1f763f1..d7c441edbffa 100644 --- a/fs/jfs/jfs_txnmgr.c +++ b/fs/jfs/jfs_txnmgr.c @@ -43,7 +43,6 @@ #include -#include #include #include #include diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c index ffdb26471641..c09af0a01b3b 100644 --- a/fs/jfs/jfs_xtree.c +++ b/fs/jfs/jfs_xtree.c @@ -20,7 +20,6 @@ */ #include -#include #include "jfs_incore.h" #include "jfs_filsys.h" #include "jfs_metapage.h" diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c index 4653128b97ef..69beb37da170 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c @@ -17,7 +17,6 @@ */ #include -#include #include "jfs_incore.h" #include "jfs_inode.h" #include "jfs_dinode.h" diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 46f0cceb3cbe..248ab7a6be33 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c @@ -17,7 +17,6 @@ */ #include -#include #include #include #include diff --git a/fs/minix/inode.c b/fs/minix/inode.c index 10fdf3f6973e..c8d490c5d24f 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c @@ -12,7 +12,6 @@ #include #include "minix.h" #include -#include #include #include diff --git a/fs/minix/itree_v1.c b/fs/minix/itree_v1.c index 83064f69675f..26216b80ab5a 100644 --- a/fs/minix/itree_v1.c +++ b/fs/minix/itree_v1.c @@ -1,5 +1,4 @@ #include "minix.h" -#include enum {DEPTH = 3, DIRECT = 7}; /* Only double indirect */ diff --git a/fs/minix/itree_v2.c b/fs/minix/itree_v2.c index 80885cc9b437..732a878b1e4c 100644 --- a/fs/minix/itree_v2.c +++ b/fs/minix/itree_v2.c @@ -1,5 +1,4 @@ #include "minix.h" -#include enum {DIRECT = 7, DEPTH = 4}; /* Have triple indirect */ diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index 32ec4f105c24..fd44657ee616 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c index 0b5f437715e2..81c224f1558f 100644 --- a/fs/ncpfs/file.c +++ b/fs/ncpfs/file.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index 854b599fde90..1c19c0269f9e 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index ea03c0e8a850..d5bced0cdbde 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index d0e7f24fe3fd..0e3de324ec19 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index f81849743d7b..5527f0d6b5d4 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 7384bc06463e..b9d0bbfb333a 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c index 21e2c0095bd2..5393901948bf 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "ntfs.h" diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c index b4896ab4008b..395cf7fec9d2 100644 --- a/fs/ntfs/compress.c +++ b/fs/ntfs/compress.c @@ -21,7 +21,6 @@ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include #include "ntfs.h" diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c index f5ff98b3c1ad..9db0fb99f901 100644 --- a/fs/ntfs/mft.c +++ b/fs/ntfs/mft.c @@ -20,7 +20,6 @@ * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include #include "ntfs.h" diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index 546eb46bb51a..1ee4c7b74aa9 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include /* For bdev_hardsect_size(). */ #include diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index c9ee76ba5d06..2c4cf1dcc5f5 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 638d218a7f15..8495f3e1fe41 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #define __NO_VERSION__ diff --git a/fs/qnx4/fsync.c b/fs/qnx4/fsync.c index 56136f136665..76c4cb0d5f0f 100644 --- a/fs/qnx4/fsync.c +++ b/fs/qnx4/fsync.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 82b411437b4f..a839e24bfa9b 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c @@ -20,10 +20,10 @@ #include #include #include -#include #include #include #include +#include #include diff --git a/fs/qnx4/truncate.c b/fs/qnx4/truncate.c index 88d9e181565a..681bdeb50a7c 100644 --- a/fs/qnx4/truncate.c +++ b/fs/qnx4/truncate.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index 6d31e937127e..35ee0a1c2604 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c index 6968c41a4680..95fccb745e06 100644 --- a/fs/reiserfs/bitmap.c +++ b/fs/reiserfs/bitmap.c @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/fs/reiserfs/buffer2.c b/fs/reiserfs/buffer2.c index b7025254a64b..62ec8424eca1 100644 --- a/fs/reiserfs/buffer2.c +++ b/fs/reiserfs/buffer2.c @@ -4,7 +4,6 @@ #include #include -#include #include #include #include diff --git a/fs/reiserfs/fix_node.c b/fs/reiserfs/fix_node.c index 9a5dd50cfaf7..802eefb3825d 100644 --- a/fs/reiserfs/fix_node.c +++ b/fs/reiserfs/fix_node.c @@ -38,7 +38,6 @@ #include #include #include -#include #include diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 2c1e3ee268b0..4a757803c44b 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c index ef41742ba491..6957b5f69ce4 100644 --- a/fs/reiserfs/ioctl.c +++ b/fs/reiserfs/ioctl.c @@ -6,8 +6,8 @@ #include #include #include +#include #include -#include /* ** reiserfs_ioctl - handler for ioctl for inode diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index 9de865554b51..de6e7de3068f 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/reiserfs/objectid.c b/fs/reiserfs/objectid.c index 503ef628aa5b..8d47a4edabd9 100644 --- a/fs/reiserfs/objectid.c +++ b/fs/reiserfs/objectid.c @@ -4,7 +4,6 @@ #include #include -#include #include #include #include diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c index 359f66b1351b..19d7e4f36976 100644 --- a/fs/reiserfs/procfs.c +++ b/fs/reiserfs/procfs.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include diff --git a/fs/reiserfs/resize.c b/fs/reiserfs/resize.c index 9b073804f3f4..59cdfa57b354 100644 --- a/fs/reiserfs/resize.c +++ b/fs/reiserfs/resize.c @@ -10,7 +10,6 @@ #include #include -#include #include #include #include diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c index e5271b25ae23..8f067bd52f2c 100644 --- a/fs/reiserfs/stree.c +++ b/fs/reiserfs/stree.c @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index b52e704d6c7f..c9dd2d3b5d5a 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c index defa8d3dd6b0..3393998bb7ab 100644 --- a/fs/reiserfs/tail_conversion.c +++ b/fs/reiserfs/tail_conversion.c @@ -6,7 +6,6 @@ #include #include #include -#include /* access to tail : when one is going to read tail it must make sure, that is not running. direct2indirect and indirect2direct can not run concurrently */ diff --git a/fs/romfs/inode.c b/fs/romfs/inode.c index 25d55c453f93..3beb8e661e1b 100644 --- a/fs/romfs/inode.c +++ b/fs/romfs/inode.c @@ -70,8 +70,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index 6807dd38a288..22a8e371b0c3 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/super.c b/fs/super.c index a8184f155bdd..13f1b7a7e34d 100644 --- a/fs/super.c +++ b/fs/super.c @@ -22,7 +22,6 @@ #include #include -#include #include #include #include diff --git a/fs/sysv/balloc.c b/fs/sysv/balloc.c index 9194ccf7fdeb..568b6231b2ae 100644 --- a/fs/sysv/balloc.c +++ b/fs/sysv/balloc.c @@ -19,7 +19,6 @@ * This file contains code for allocating/freeing blocks. */ -#include #include "sysv.h" /* We don't trust the value of diff --git a/fs/sysv/ialloc.c b/fs/sysv/ialloc.c index afda24dcf2d0..183358d83b43 100644 --- a/fs/sysv/ialloc.c +++ b/fs/sysv/ialloc.c @@ -21,9 +21,9 @@ #include #include +#include #include #include -#include #include "sysv.h" /* We don't trust the value of diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c index 29ab0cc3c3f1..953a70c01df4 100644 --- a/fs/sysv/inode.c +++ b/fs/sysv/inode.c @@ -21,7 +21,6 @@ * the superblock. */ -#include #include #include #include diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c index 75beb1554f98..bc6690583a1b 100644 --- a/fs/sysv/itree.c +++ b/fs/sysv/itree.c @@ -5,7 +5,6 @@ * AV, Sep--Dec 2000 */ -#include #include "sysv.h" enum {DIRECT = 10, DEPTH = 4}; /* Have triple indirect */ diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c index eab06b2999d7..09411fa827d2 100644 --- a/fs/udf/balloc.c +++ b/fs/udf/balloc.c @@ -26,7 +26,6 @@ #include "udfdecl.h" -#include #include #include diff --git a/fs/udf/file.c b/fs/udf/file.c index 30e38892a753..6e5c92c5d275 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c @@ -37,8 +37,8 @@ #include #include /* memset */ #include -#include #include +#include #include "udf_i.h" #include "udf_sb.h" diff --git a/fs/udf/fsync.c b/fs/udf/fsync.c index c36daeee6d10..e81448d0c875 100644 --- a/fs/udf/fsync.c +++ b/fs/udf/fsync.c @@ -26,7 +26,6 @@ #include "udfdecl.h" #include -#include #include /* diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c index 5f58afa05f8a..d22e26bed2af 100644 --- a/fs/udf/ialloc.c +++ b/fs/udf/ialloc.c @@ -25,7 +25,6 @@ #include "udfdecl.h" #include -#include #include #include diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 1c229f5c912b..40696bade927 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -34,10 +34,10 @@ */ #include "udfdecl.h" -#include #include #include #include +#include #include "udf_i.h" #include "udf_sb.h" diff --git a/fs/udf/namei.c b/fs/udf/namei.c index 60b9a37438e3..28db72d58da5 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c @@ -33,7 +33,6 @@ #include #include #include -#include #include static inline int udf_match(int len, const char * const name, struct qstr *qs) diff --git a/fs/udf/super.c b/fs/udf/super.c index bc8a0576ec45..0858d29c3418 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c index 5f7102461577..6154c29324f8 100644 --- a/fs/ufs/balloc.c +++ b/fs/ufs/balloc.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/ufs/cylinder.c b/fs/ufs/cylinder.c index a0729feed07f..daf11e4dcf66 100644 --- a/fs/ufs/cylinder.c +++ b/fs/ufs/cylinder.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c index 9bbd31501b72..bd3c40da7d9e 100644 --- a/fs/ufs/dir.c +++ b/fs/ufs/dir.c @@ -14,7 +14,6 @@ */ #include -#include #include #include #include diff --git a/fs/ufs/file.c b/fs/ufs/file.c index fd6332175401..f282ea559c80 100644 --- a/fs/ufs/file.c +++ b/fs/ufs/file.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c index c0a435a09a26..d82fd117b869 100644 --- a/fs/ufs/ialloc.c +++ b/fs/ufs/ialloc.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index e10b5a35dca9..8e5bcf749231 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include diff --git a/fs/ufs/super.c b/fs/ufs/super.c index cdf4ad6a84b2..5971709836a6 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -77,7 +77,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/ufs/truncate.c b/fs/ufs/truncate.c index a2b6ed7a016c..758fc57b5574 100644 --- a/fs/ufs/truncate.c +++ b/fs/ufs/truncate.c @@ -35,7 +35,6 @@ #include #include #include -#include #include #include diff --git a/fs/ufs/util.c b/fs/ufs/util.c index b40e7ab8524d..6e859dc6afef 100644 --- a/fs/ufs/util.c +++ b/fs/ufs/util.c @@ -8,7 +8,6 @@ #include #include -#include #include #include "swab.h" diff --git a/include/linux/amigaffs.h b/include/linux/amigaffs.h index 535c3bf41b9a..f02e8cbd0131 100644 --- a/include/linux/amigaffs.h +++ b/include/linux/amigaffs.h @@ -2,7 +2,6 @@ #define AMIGAFFS_H #include -#include #include diff --git a/include/linux/blk.h b/include/linux/blk.h index 9be0913f6069..62d37b2b4c17 100644 --- a/include/linux/blk.h +++ b/include/linux/blk.h @@ -3,7 +3,6 @@ #include #include -#include #include #include #include diff --git a/include/linux/fs.h b/include/linux/fs.h index df5c5fdb0c6f..ab0a05dc8e26 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -682,6 +682,19 @@ struct super_block { struct semaphore s_vfs_rename_sem; /* Kludge */ }; +/* + * Superblock locking. + */ +static inline void lock_super(struct super_block * sb) +{ + down(&sb->s_lock); +} + +static inline void unlock_super(struct super_block * sb) +{ + up(&sb->s_lock); +} + /* * VFS helper functions.. */ diff --git a/include/linux/hfs_sysdep.h b/include/linux/hfs_sysdep.h index 62fcf2ea311f..a08d5aa9e39d 100644 --- a/include/linux/hfs_sysdep.h +++ b/include/linux/hfs_sysdep.h @@ -19,8 +19,8 @@ #include #include -#include #include +#include #include #include diff --git a/include/linux/locks.h b/include/linux/locks.h deleted file mode 100644 index a380c5e4f0bb..000000000000 --- a/include/linux/locks.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _LINUX_LOCKS_H -#define _LINUX_LOCKS_H - -#ifndef _LINUX_MM_H -#include -#endif -#ifndef _LINUX_PAGEMAP_H -#include -#endif - -/* - * super-block locking. Again, interrupts may only unlock - * a super-block (although even this isn't done right now. - * nfs may need it). - */ - -static inline void lock_super(struct super_block * sb) -{ - down(&sb->s_lock); -} - -static inline void unlock_super(struct super_block * sb) -{ - up(&sb->s_lock); -} - -#endif /* _LINUX_LOCKS_H */ - diff --git a/include/linux/nbd.h b/include/linux/nbd.h index b6120317731d..556b847804ca 100644 --- a/include/linux/nbd.h +++ b/include/linux/nbd.h @@ -22,7 +22,6 @@ #ifdef MAJOR_NR -#include #include #define LOCAL_END_REQUEST diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h index bf586df47298..cb6332482af2 100644 --- a/include/linux/raid/md.h +++ b/include/linux/raid/md.h @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/include/linux/swap.h b/include/linux/swap.h index 1674b5acd6f7..3a376842c21c 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -91,6 +91,7 @@ struct swap_info_struct { int next; /* next entry on swap list */ }; +struct inode; extern int nr_swap_pages; /* Swap 50% full? Release swapcache more aggressively.. */ diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h index 609d0dab2c6f..faccf5ad22d5 100644 --- a/include/linux/ufs_fs.h +++ b/include/linux/ufs_fs.h @@ -31,6 +31,7 @@ #include #include #include +#include #define UFS_BBLOCK 0 #define UFS_BBSIZE 8192 diff --git a/kernel/ksyms.c b/kernel/ksyms.c index c00aef0e313e..add2ac9dd8f3 100644 --- a/kernel/ksyms.c +++ b/kernel/ksyms.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/mm/page_io.c b/mm/page_io.c index 05594b07aba9..85bb9049ee0f 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -12,8 +12,8 @@ #include #include +#include #include -#include #include #include diff --git a/mm/shmem.c b/mm/shmem.c index 615b0051bbcf..fa365c456448 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/net/khttpd/datasending.c b/net/khttpd/datasending.c index d1663cc21ef0..c78ef11b39b3 100644 --- a/net/khttpd/datasending.c +++ b/net/khttpd/datasending.c @@ -36,7 +36,6 @@ Return value: #include #include -#include #include #include -- cgit v1.2.3