aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2007-05-08 03:28:08 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:07 -0400
commite63340ae6b6205fef26b40a75673d1c9c0c8bb90 (patch)
tree8d3212705515edec73c3936bb9e23c71d34a7b41 /fs
parent04c9167f91e309c9c4ea982992aa08e83b2eb42e (diff)
header cleaning: don't include smp_lock.h when not used
Remove includes of <linux/smp_lock.h> where it is not used/needed. Suggested by Al Viro. Builds cleanly on x86_64, i386, alpha, ia64, powerpc, sparc, sparc64, and arm (all 59 defconfigs). Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/9p/vfs_addr.c1
-rw-r--r--fs/9p/vfs_dentry.c1
-rw-r--r--fs/9p/vfs_dir.c1
-rw-r--r--fs/9p/vfs_file.c1
-rw-r--r--fs/9p/vfs_inode.c1
-rw-r--r--fs/9p/vfs_super.c1
-rw-r--r--fs/attr.c1
-rw-r--r--fs/autofs4/inode.c1
-rw-r--r--fs/autofs4/root.c1
-rw-r--r--fs/bad_inode.c1
-rw-r--r--fs/binfmt_elf.c1
-rw-r--r--fs/binfmt_elf_fdpic.c1
-rw-r--r--fs/binfmt_em86.c1
-rw-r--r--fs/binfmt_script.c1
-rw-r--r--fs/buffer.c1
-rw-r--r--fs/cifs/file.c1
-rw-r--r--fs/cifs/readdir.c1
-rw-r--r--fs/compat_ioctl.c1
-rw-r--r--fs/dcache.c1
-rw-r--r--fs/dquot.c1
-rw-r--r--fs/ecryptfs/file.c1
-rw-r--r--fs/eventpoll.c1
-rw-r--r--fs/exportfs/expfs.c1
-rw-r--r--fs/ext2/dir.c1
-rw-r--r--fs/ext2/fsync.c1
-rw-r--r--fs/ext2/xattr_security.c1
-rw-r--r--fs/ext2/xattr_trusted.c1
-rw-r--r--fs/ext3/dir.c1
-rw-r--r--fs/ext3/inode.c1
-rw-r--r--fs/ext3/namei.c1
-rw-r--r--fs/ext3/resize.c1
-rw-r--r--fs/ext3/xattr_security.c1
-rw-r--r--fs/ext3/xattr_trusted.c1
-rw-r--r--fs/ext3/xattr_user.c1
-rw-r--r--fs/ext4/dir.c1
-rw-r--r--fs/ext4/extents.c1
-rw-r--r--fs/ext4/inode.c1
-rw-r--r--fs/ext4/namei.c1
-rw-r--r--fs/ext4/resize.c1
-rw-r--r--fs/ext4/xattr_security.c1
-rw-r--r--fs/ext4/xattr_trusted.c1
-rw-r--r--fs/ext4/xattr_user.c1
-rw-r--r--fs/fifo.c1
-rw-r--r--fs/file_table.c1
-rw-r--r--fs/gfs2/locking/nolock/main.c1
-rw-r--r--fs/gfs2/ops_dentry.c1
-rw-r--r--fs/gfs2/ops_file.c1
-rw-r--r--fs/jbd/commit.c1
-rw-r--r--fs/jbd/journal.c1
-rw-r--r--fs/jbd/revoke.c1
-rw-r--r--fs/jbd/transaction.c1
-rw-r--r--fs/jbd2/commit.c1
-rw-r--r--fs/jbd2/journal.c1
-rw-r--r--fs/jbd2/revoke.c1
-rw-r--r--fs/jbd2/transaction.c1
-rw-r--r--fs/jfs/jfs_logmgr.c1
-rw-r--r--fs/jfs/jfs_txnmgr.c1
-rw-r--r--fs/lockd/clntproc.c1
-rw-r--r--fs/namei.c1
-rw-r--r--fs/ncpfs/file.c1
-rw-r--r--fs/nfs/client.c1
-rw-r--r--fs/nfs/direct.c1
-rw-r--r--fs/nfs/getroot.c1
-rw-r--r--fs/nfs/nfs3proc.c1
-rw-r--r--fs/nfs/nfs4renewd.c1
-rw-r--r--fs/nfs/proc.c1
-rw-r--r--fs/nfs/symlink.c1
-rw-r--r--fs/nfs/write.c1
-rw-r--r--fs/nfsd/nfs4idmap.c1
-rw-r--r--fs/nfsd/nfs4xdr.c1
-rw-r--r--fs/nfsd/nfsfh.c1
-rw-r--r--fs/ntfs/dir.c1
-rw-r--r--fs/ntfs/inode.c1
-rw-r--r--fs/ocfs2/dlm/dlmfs.c1
-rw-r--r--fs/ocfs2/dlmglue.c1
-rw-r--r--fs/ocfs2/inode.c1
-rw-r--r--fs/ocfs2/slot_map.c1
-rw-r--r--fs/ocfs2/vote.c1
-rw-r--r--fs/open.c1
-rw-r--r--fs/proc/base.c1
-rw-r--r--fs/proc/proc_misc.c1
-rw-r--r--fs/quota.c1
-rw-r--r--fs/ramfs/file-nommu.c1
-rw-r--r--fs/ramfs/inode.c1
-rw-r--r--fs/readdir.c1
-rw-r--r--fs/reiserfs/dir.c1
-rw-r--r--fs/reiserfs/file.c1
-rw-r--r--fs/reiserfs/namei.c1
-rw-r--r--fs/reiserfs/procfs.c1
-rw-r--r--fs/reiserfs/stree.c1
-rw-r--r--fs/reiserfs/super.c1
-rw-r--r--fs/select.c1
-rw-r--r--fs/smbfs/smbiod.c1
-rw-r--r--fs/smbfs/sock.c1
-rw-r--r--fs/smbfs/symlink.c1
-rw-r--r--fs/stat.c1
-rw-r--r--fs/sysv/namei.c1
-rw-r--r--fs/udf/fsync.c1
-rw-r--r--fs/ufs/dir.c1
-rw-r--r--fs/xattr.c1
100 files changed, 0 insertions, 100 deletions
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index bed48fa96521..3128aa948a4e 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -29,7 +29,6 @@
29#include <linux/file.h> 29#include <linux/file.h>
30#include <linux/stat.h> 30#include <linux/stat.h>
31#include <linux/string.h> 31#include <linux/string.h>
32#include <linux/smp_lock.h>
33#include <linux/inet.h> 32#include <linux/inet.h>
34#include <linux/pagemap.h> 33#include <linux/pagemap.h>
35#include <linux/idr.h> 34#include <linux/idr.h>
diff --git a/fs/9p/vfs_dentry.c b/fs/9p/vfs_dentry.c
index ddffd8aa902d..775e26e82cbc 100644
--- a/fs/9p/vfs_dentry.c
+++ b/fs/9p/vfs_dentry.c
@@ -30,7 +30,6 @@
30#include <linux/pagemap.h> 30#include <linux/pagemap.h>
31#include <linux/stat.h> 31#include <linux/stat.h>
32#include <linux/string.h> 32#include <linux/string.h>
33#include <linux/smp_lock.h>
34#include <linux/inet.h> 33#include <linux/inet.h>
35#include <linux/namei.h> 34#include <linux/namei.h>
36#include <linux/idr.h> 35#include <linux/idr.h>
diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c
index 3129688143ea..1dd86ee90bc5 100644
--- a/fs/9p/vfs_dir.c
+++ b/fs/9p/vfs_dir.c
@@ -29,7 +29,6 @@
29#include <linux/file.h> 29#include <linux/file.h>
30#include <linux/stat.h> 30#include <linux/stat.h>
31#include <linux/string.h> 31#include <linux/string.h>
32#include <linux/smp_lock.h>
33#include <linux/sched.h> 32#include <linux/sched.h>
34#include <linux/inet.h> 33#include <linux/inet.h>
35#include <linux/idr.h> 34#include <linux/idr.h>
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index c7b677253843..6e7678e4852f 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -30,7 +30,6 @@
30#include <linux/file.h> 30#include <linux/file.h>
31#include <linux/stat.h> 31#include <linux/stat.h>
32#include <linux/string.h> 32#include <linux/string.h>
33#include <linux/smp_lock.h>
34#include <linux/inet.h> 33#include <linux/inet.h>
35#include <linux/list.h> 34#include <linux/list.h>
36#include <asm/uaccess.h> 35#include <asm/uaccess.h>
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index b01b0a457932..7624821729a0 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -30,7 +30,6 @@
30#include <linux/pagemap.h> 30#include <linux/pagemap.h>
31#include <linux/stat.h> 31#include <linux/stat.h>
32#include <linux/string.h> 32#include <linux/string.h>
33#include <linux/smp_lock.h>
34#include <linux/inet.h> 33#include <linux/inet.h>
35#include <linux/namei.h> 34#include <linux/namei.h>
36#include <linux/idr.h> 35#include <linux/idr.h>
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index 0ec42f665457..8eb9263a67b9 100644
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -31,7 +31,6 @@
31#include <linux/file.h> 31#include <linux/file.h>
32#include <linux/stat.h> 32#include <linux/stat.h>
33#include <linux/string.h> 33#include <linux/string.h>
34#include <linux/smp_lock.h>
35#include <linux/inet.h> 34#include <linux/inet.h>
36#include <linux/pagemap.h> 35#include <linux/pagemap.h>
37#include <linux/seq_file.h> 36#include <linux/seq_file.h>
diff --git a/fs/attr.c b/fs/attr.c
index 97de94670878..a0a0c7b07ba3 100644
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -9,7 +9,6 @@
9#include <linux/time.h> 9#include <linux/time.h>
10#include <linux/mm.h> 10#include <linux/mm.h>
11#include <linux/string.h> 11#include <linux/string.h>
12#include <linux/smp_lock.h>
13#include <linux/capability.h> 12#include <linux/capability.h>
14#include <linux/fsnotify.h> 13#include <linux/fsnotify.h>
15#include <linux/fcntl.h> 14#include <linux/fcntl.h>
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 26063dc84a2a..5769a2f9ad60 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -18,7 +18,6 @@
18#include <linux/pagemap.h> 18#include <linux/pagemap.h>
19#include <linux/parser.h> 19#include <linux/parser.h>
20#include <linux/bitops.h> 20#include <linux/bitops.h>
21#include <linux/smp_lock.h>
22#include <linux/magic.h> 21#include <linux/magic.h>
23#include "autofs_i.h" 22#include "autofs_i.h"
24#include <linux/module.h> 23#include <linux/module.h>
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index d0e9b3a3905d..15170f4e13a7 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -17,7 +17,6 @@
17#include <linux/stat.h> 17#include <linux/stat.h>
18#include <linux/param.h> 18#include <linux/param.h>
19#include <linux/time.h> 19#include <linux/time.h>
20#include <linux/smp_lock.h>
21#include "autofs_i.h" 20#include "autofs_i.h"
22 21
23static int autofs4_dir_symlink(struct inode *,struct dentry *,const char *); 22static int autofs4_dir_symlink(struct inode *,struct dentry *,const char *);
diff --git a/fs/bad_inode.c b/fs/bad_inode.c
index efeab2fab40b..329ee473eede 100644
--- a/fs/bad_inode.c
+++ b/fs/bad_inode.c
@@ -12,7 +12,6 @@
12#include <linux/module.h> 12#include <linux/module.h>
13#include <linux/stat.h> 13#include <linux/stat.h>
14#include <linux/time.h> 14#include <linux/time.h>
15#include <linux/smp_lock.h>
16#include <linux/namei.h> 15#include <linux/namei.h>
17#include <linux/poll.h> 16#include <linux/poll.h>
18 17
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 9cc4f0a8aaae..2939db0231f1 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -31,7 +31,6 @@
31#include <linux/init.h> 31#include <linux/init.h>
32#include <linux/highuid.h> 32#include <linux/highuid.h>
33#include <linux/smp.h> 33#include <linux/smp.h>
34#include <linux/smp_lock.h>
35#include <linux/compiler.h> 34#include <linux/compiler.h>
36#include <linux/highmem.h> 35#include <linux/highmem.h>
37#include <linux/pagemap.h> 36#include <linux/pagemap.h>
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index f3ddca4a387b..9d62fbad3d4b 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -30,7 +30,6 @@
30#include <linux/personality.h> 30#include <linux/personality.h>
31#include <linux/ptrace.h> 31#include <linux/ptrace.h>
32#include <linux/init.h> 32#include <linux/init.h>
33#include <linux/smp_lock.h>
34#include <linux/elf.h> 33#include <linux/elf.h>
35#include <linux/elf-fdpic.h> 34#include <linux/elf-fdpic.h>
36#include <linux/elfcore.h> 35#include <linux/elfcore.h>
diff --git a/fs/binfmt_em86.c b/fs/binfmt_em86.c
index 1f2d1ad63319..576dd7de2278 100644
--- a/fs/binfmt_em86.c
+++ b/fs/binfmt_em86.c
@@ -12,7 +12,6 @@
12#include <linux/string.h> 12#include <linux/string.h>
13#include <linux/stat.h> 13#include <linux/stat.h>
14#include <linux/slab.h> 14#include <linux/slab.h>
15#include <linux/smp_lock.h>
16#include <linux/binfmts.h> 15#include <linux/binfmts.h>
17#include <linux/elf.h> 16#include <linux/elf.h>
18#include <linux/init.h> 17#include <linux/init.h>
diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c
index 1edbcca25a73..304c88544d89 100644
--- a/fs/binfmt_script.c
+++ b/fs/binfmt_script.c
@@ -12,7 +12,6 @@
12#include <linux/binfmts.h> 12#include <linux/binfmts.h>
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/file.h> 14#include <linux/file.h>
15#include <linux/smp_lock.h>
16#include <linux/err.h> 15#include <linux/err.h>
17#include <linux/fs.h> 16#include <linux/fs.h>
18 17
diff --git a/fs/buffer.c b/fs/buffer.c
index 3b226f7d9696..eb820b82a636 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -24,7 +24,6 @@
24#include <linux/mm.h> 24#include <linux/mm.h>
25#include <linux/percpu.h> 25#include <linux/percpu.h>
26#include <linux/slab.h> 26#include <linux/slab.h>
27#include <linux/smp_lock.h>
28#include <linux/capability.h> 27#include <linux/capability.h>
29#include <linux/blkdev.h> 28#include <linux/blkdev.h>
30#include <linux/file.h> 29#include <linux/file.h>
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index b570530f97bf..94d5b49049df 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -27,7 +27,6 @@
27#include <linux/fcntl.h> 27#include <linux/fcntl.h>
28#include <linux/pagemap.h> 28#include <linux/pagemap.h>
29#include <linux/pagevec.h> 29#include <linux/pagevec.h>
30#include <linux/smp_lock.h>
31#include <linux/writeback.h> 30#include <linux/writeback.h>
32#include <linux/task_io_accounting_ops.h> 31#include <linux/task_io_accounting_ops.h>
33#include <linux/delay.h> 32#include <linux/delay.h>
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index b5364f90d551..c08bda9fcac6 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -23,7 +23,6 @@
23#include <linux/fs.h> 23#include <linux/fs.h>
24#include <linux/pagemap.h> 24#include <linux/pagemap.h>
25#include <linux/stat.h> 25#include <linux/stat.h>
26#include <linux/smp_lock.h>
27#include "cifspdu.h" 26#include "cifspdu.h"
28#include "cifsglob.h" 27#include "cifsglob.h"
29#include "cifsproto.h" 28#include "cifsproto.h"
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 464c04a9541d..c870364b0b47 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -17,7 +17,6 @@
17#include <linux/compiler.h> 17#include <linux/compiler.h>
18#include <linux/sched.h> 18#include <linux/sched.h>
19#include <linux/smp.h> 19#include <linux/smp.h>
20#include <linux/smp_lock.h>
21#include <linux/ioctl.h> 20#include <linux/ioctl.h>
22#include <linux/if.h> 21#include <linux/if.h>
23#include <linux/if_bridge.h> 22#include <linux/if_bridge.h>
diff --git a/fs/dcache.c b/fs/dcache.c
index 2135ab8bb103..0e73aa0a0e8b 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -21,7 +21,6 @@
21#include <linux/fsnotify.h> 21#include <linux/fsnotify.h>
22#include <linux/slab.h> 22#include <linux/slab.h>
23#include <linux/init.h> 23#include <linux/init.h>
24#include <linux/smp_lock.h>
25#include <linux/hash.h> 24#include <linux/hash.h>
26#include <linux/cache.h> 25#include <linux/cache.h>
27#include <linux/module.h> 26#include <linux/module.h>
diff --git a/fs/dquot.c b/fs/dquot.c
index ca40bfc5cccc..dcc5a582e1f1 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -69,7 +69,6 @@
69#include <linux/file.h> 69#include <linux/file.h>
70#include <linux/slab.h> 70#include <linux/slab.h>
71#include <linux/sysctl.h> 71#include <linux/sysctl.h>
72#include <linux/smp_lock.h>
73#include <linux/init.h> 72#include <linux/init.h>
74#include <linux/module.h> 73#include <linux/module.h>
75#include <linux/proc_fs.h> 74#include <linux/proc_fs.h>
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 7a7d25d541e7..9881b5c5de59 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -28,7 +28,6 @@
28#include <linux/mount.h> 28#include <linux/mount.h>
29#include <linux/pagemap.h> 29#include <linux/pagemap.h>
30#include <linux/security.h> 30#include <linux/security.h>
31#include <linux/smp_lock.h>
32#include <linux/compat.h> 31#include <linux/compat.h>
33#include <linux/fs_stack.h> 32#include <linux/fs_stack.h>
34#include "ecryptfs_kernel.h" 33#include "ecryptfs_kernel.h"
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 997711c5a732..d0b86060cc19 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -22,7 +22,6 @@
22#include <linux/mm.h> 22#include <linux/mm.h>
23#include <linux/slab.h> 23#include <linux/slab.h>
24#include <linux/poll.h> 24#include <linux/poll.h>
25#include <linux/smp_lock.h>
26#include <linux/string.h> 25#include <linux/string.h>
27#include <linux/list.h> 26#include <linux/list.h>
28#include <linux/hash.h> 27#include <linux/hash.h>
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c
index 93e77c3d2490..e98f6cd7200c 100644
--- a/fs/exportfs/expfs.c
+++ b/fs/exportfs/expfs.c
@@ -2,7 +2,6 @@
2#include <linux/fs.h> 2#include <linux/fs.h>
3#include <linux/file.h> 3#include <linux/file.h>
4#include <linux/module.h> 4#include <linux/module.h>
5#include <linux/smp_lock.h>
6#include <linux/namei.h> 5#include <linux/namei.h>
7 6
8struct export_operations export_op_default; 7struct export_operations export_op_default;
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
index 1d1e7e30d70e..2bf49d7ef841 100644
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -23,7 +23,6 @@
23 23
24#include "ext2.h" 24#include "ext2.h"
25#include <linux/pagemap.h> 25#include <linux/pagemap.h>
26#include <linux/smp_lock.h>
27 26
28typedef struct ext2_dir_entry_2 ext2_dirent; 27typedef struct ext2_dir_entry_2 ext2_dirent;
29 28
diff --git a/fs/ext2/fsync.c b/fs/ext2/fsync.c
index 7806b9e8155b..fc66c93fcb5c 100644
--- a/fs/ext2/fsync.c
+++ b/fs/ext2/fsync.c
@@ -23,7 +23,6 @@
23 */ 23 */
24 24
25#include "ext2.h" 25#include "ext2.h"
26#include <linux/smp_lock.h>
27#include <linux/buffer_head.h> /* for sync_mapping_buffers() */ 26#include <linux/buffer_head.h> /* for sync_mapping_buffers() */
28 27
29 28
diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c
index a26612798471..eaa23d2d5213 100644
--- a/fs/ext2/xattr_security.c
+++ b/fs/ext2/xattr_security.c
@@ -6,7 +6,6 @@
6#include <linux/module.h> 6#include <linux/module.h>
7#include <linux/string.h> 7#include <linux/string.h>
8#include <linux/fs.h> 8#include <linux/fs.h>
9#include <linux/smp_lock.h>
10#include <linux/ext2_fs.h> 9#include <linux/ext2_fs.h>
11#include <linux/security.h> 10#include <linux/security.h>
12#include "xattr.h" 11#include "xattr.h"
diff --git a/fs/ext2/xattr_trusted.c b/fs/ext2/xattr_trusted.c
index f28a6a499c96..83ee149f353d 100644
--- a/fs/ext2/xattr_trusted.c
+++ b/fs/ext2/xattr_trusted.c
@@ -9,7 +9,6 @@
9#include <linux/string.h> 9#include <linux/string.h>
10#include <linux/capability.h> 10#include <linux/capability.h>
11#include <linux/fs.h> 11#include <linux/fs.h>
12#include <linux/smp_lock.h>
13#include <linux/ext2_fs.h> 12#include <linux/ext2_fs.h>
14#include "xattr.h" 13#include "xattr.h"
15 14
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
index 665adee99b31..852869840f24 100644
--- a/fs/ext3/dir.c
+++ b/fs/ext3/dir.c
@@ -25,7 +25,6 @@
25#include <linux/jbd.h> 25#include <linux/jbd.h>
26#include <linux/ext3_fs.h> 26#include <linux/ext3_fs.h>
27#include <linux/buffer_head.h> 27#include <linux/buffer_head.h>
28#include <linux/smp_lock.h>
29#include <linux/slab.h> 28#include <linux/slab.h>
30#include <linux/rbtree.h> 29#include <linux/rbtree.h>
31 30
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 2088666e80ba..f9bcddbd2ef1 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -27,7 +27,6 @@
27#include <linux/time.h> 27#include <linux/time.h>
28#include <linux/ext3_jbd.h> 28#include <linux/ext3_jbd.h>
29#include <linux/jbd.h> 29#include <linux/jbd.h>
30#include <linux/smp_lock.h>
31#include <linux/highuid.h> 30#include <linux/highuid.h>
32#include <linux/pagemap.h> 31#include <linux/pagemap.h>
33#include <linux/quotaops.h> 32#include <linux/quotaops.h>
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 7edb617fd33d..9bb046df827a 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -36,7 +36,6 @@
36#include <linux/quotaops.h> 36#include <linux/quotaops.h>
37#include <linux/buffer_head.h> 37#include <linux/buffer_head.h>
38#include <linux/bio.h> 38#include <linux/bio.h>
39#include <linux/smp_lock.h>
40 39
41#include "namei.h" 40#include "namei.h"
42#include "xattr.h" 41#include "xattr.h"
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index ecf89904c113..2c97e09c6c6b 100644
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
@@ -11,7 +11,6 @@
11 11
12#define EXT3FS_DEBUG 12#define EXT3FS_DEBUG
13 13
14#include <linux/smp_lock.h>
15#include <linux/ext3_jbd.h> 14#include <linux/ext3_jbd.h>
16 15
17#include <linux/errno.h> 16#include <linux/errno.h>
diff --git a/fs/ext3/xattr_security.c b/fs/ext3/xattr_security.c
index b9c40c15647b..821efaf2b94e 100644
--- a/fs/ext3/xattr_security.c
+++ b/fs/ext3/xattr_security.c
@@ -6,7 +6,6 @@
6#include <linux/module.h> 6#include <linux/module.h>
7#include <linux/string.h> 7#include <linux/string.h>
8#include <linux/fs.h> 8#include <linux/fs.h>
9#include <linux/smp_lock.h>
10#include <linux/ext3_jbd.h> 9#include <linux/ext3_jbd.h>
11#include <linux/ext3_fs.h> 10#include <linux/ext3_fs.h>
12#include <linux/security.h> 11#include <linux/security.h>
diff --git a/fs/ext3/xattr_trusted.c b/fs/ext3/xattr_trusted.c
index 86d91f1186dc..0327497a55ce 100644
--- a/fs/ext3/xattr_trusted.c
+++ b/fs/ext3/xattr_trusted.c
@@ -9,7 +9,6 @@
9#include <linux/string.h> 9#include <linux/string.h>
10#include <linux/capability.h> 10#include <linux/capability.h>
11#include <linux/fs.h> 11#include <linux/fs.h>
12#include <linux/smp_lock.h>
13#include <linux/ext3_jbd.h> 12#include <linux/ext3_jbd.h>
14#include <linux/ext3_fs.h> 13#include <linux/ext3_fs.h>
15#include "xattr.h" 14#include "xattr.h"
diff --git a/fs/ext3/xattr_user.c b/fs/ext3/xattr_user.c
index a85a0a17c4fd..1abd8f92c440 100644
--- a/fs/ext3/xattr_user.c
+++ b/fs/ext3/xattr_user.c
@@ -8,7 +8,6 @@
8#include <linux/module.h> 8#include <linux/module.h>
9#include <linux/string.h> 9#include <linux/string.h>
10#include <linux/fs.h> 10#include <linux/fs.h>
11#include <linux/smp_lock.h>
12#include <linux/ext3_jbd.h> 11#include <linux/ext3_jbd.h>
13#include <linux/ext3_fs.h> 12#include <linux/ext3_fs.h>
14#include "xattr.h" 13#include "xattr.h"
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index da80368b66f0..e8ad06e28318 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -25,7 +25,6 @@
25#include <linux/jbd2.h> 25#include <linux/jbd2.h>
26#include <linux/ext4_fs.h> 26#include <linux/ext4_fs.h>
27#include <linux/buffer_head.h> 27#include <linux/buffer_head.h>
28#include <linux/smp_lock.h>
29#include <linux/slab.h> 28#include <linux/slab.h>
30#include <linux/rbtree.h> 29#include <linux/rbtree.h>
31 30
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 7916b50f9a13..a0f0c04e79b2 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -34,7 +34,6 @@
34#include <linux/time.h> 34#include <linux/time.h>
35#include <linux/ext4_jbd2.h> 35#include <linux/ext4_jbd2.h>
36#include <linux/jbd.h> 36#include <linux/jbd.h>
37#include <linux/smp_lock.h>
38#include <linux/highuid.h> 37#include <linux/highuid.h>
39#include <linux/pagemap.h> 38#include <linux/pagemap.h>
40#include <linux/quotaops.h> 39#include <linux/quotaops.h>
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 053cd1f453cc..b34182b6ee4d 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -27,7 +27,6 @@
27#include <linux/time.h> 27#include <linux/time.h>
28#include <linux/ext4_jbd2.h> 28#include <linux/ext4_jbd2.h>
29#include <linux/jbd2.h> 29#include <linux/jbd2.h>
30#include <linux/smp_lock.h>
31#include <linux/highuid.h> 30#include <linux/highuid.h>
32#include <linux/pagemap.h> 31#include <linux/pagemap.h>
33#include <linux/quotaops.h> 32#include <linux/quotaops.h>
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 757c1384c2d6..4ec57be5baf5 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -36,7 +36,6 @@
36#include <linux/quotaops.h> 36#include <linux/quotaops.h>
37#include <linux/buffer_head.h> 37#include <linux/buffer_head.h>
38#include <linux/bio.h> 38#include <linux/bio.h>
39#include <linux/smp_lock.h>
40 39
41#include "namei.h" 40#include "namei.h"
42#include "xattr.h" 41#include "xattr.h"
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index ea99f6c97f56..aa11d7dbe970 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -11,7 +11,6 @@
11 11
12#define EXT4FS_DEBUG 12#define EXT4FS_DEBUG
13 13
14#include <linux/smp_lock.h>
15#include <linux/ext4_jbd2.h> 14#include <linux/ext4_jbd2.h>
16 15
17#include <linux/errno.h> 16#include <linux/errno.h>
diff --git a/fs/ext4/xattr_security.c b/fs/ext4/xattr_security.c
index b6a6861951f9..f17eaf2321b9 100644
--- a/fs/ext4/xattr_security.c
+++ b/fs/ext4/xattr_security.c
@@ -6,7 +6,6 @@
6#include <linux/module.h> 6#include <linux/module.h>
7#include <linux/string.h> 7#include <linux/string.h>
8#include <linux/fs.h> 8#include <linux/fs.h>
9#include <linux/smp_lock.h>
10#include <linux/ext4_jbd2.h> 9#include <linux/ext4_jbd2.h>
11#include <linux/ext4_fs.h> 10#include <linux/ext4_fs.h>
12#include <linux/security.h> 11#include <linux/security.h>
diff --git a/fs/ext4/xattr_trusted.c b/fs/ext4/xattr_trusted.c
index b76f2dbc82da..e0f05acdafec 100644
--- a/fs/ext4/xattr_trusted.c
+++ b/fs/ext4/xattr_trusted.c
@@ -9,7 +9,6 @@
9#include <linux/string.h> 9#include <linux/string.h>
10#include <linux/capability.h> 10#include <linux/capability.h>
11#include <linux/fs.h> 11#include <linux/fs.h>
12#include <linux/smp_lock.h>
13#include <linux/ext4_jbd2.h> 12#include <linux/ext4_jbd2.h>
14#include <linux/ext4_fs.h> 13#include <linux/ext4_fs.h>
15#include "xattr.h" 14#include "xattr.h"
diff --git a/fs/ext4/xattr_user.c b/fs/ext4/xattr_user.c
index c53cded0761a..7ed3d8ebf096 100644
--- a/fs/ext4/xattr_user.c
+++ b/fs/ext4/xattr_user.c
@@ -8,7 +8,6 @@
8#include <linux/module.h> 8#include <linux/module.h>
9#include <linux/string.h> 9#include <linux/string.h>
10#include <linux/fs.h> 10#include <linux/fs.h>
11#include <linux/smp_lock.h>
12#include <linux/ext4_jbd2.h> 11#include <linux/ext4_jbd2.h>
13#include <linux/ext4_fs.h> 12#include <linux/ext4_fs.h>
14#include "xattr.h" 13#include "xattr.h"
diff --git a/fs/fifo.c b/fs/fifo.c
index 49035b174b48..6e7df7256782 100644
--- a/fs/fifo.c
+++ b/fs/fifo.c
@@ -11,7 +11,6 @@
11 11
12#include <linux/mm.h> 12#include <linux/mm.h>
13#include <linux/slab.h> 13#include <linux/slab.h>
14#include <linux/smp_lock.h>
15#include <linux/fs.h> 14#include <linux/fs.h>
16#include <linux/pipe_fs_i.h> 15#include <linux/pipe_fs_i.h>
17 16
diff --git a/fs/file_table.c b/fs/file_table.c
index 4c17a18d8c10..d17fd691b832 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -10,7 +10,6 @@
10#include <linux/file.h> 10#include <linux/file.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/module.h> 12#include <linux/module.h>
13#include <linux/smp_lock.h>
14#include <linux/fs.h> 13#include <linux/fs.h>
15#include <linux/security.h> 14#include <linux/security.h>
16#include <linux/eventpoll.h> 15#include <linux/eventpoll.h>
diff --git a/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c
index 5cc1dfa7944a..0d149c8c493a 100644
--- a/fs/gfs2/locking/nolock/main.c
+++ b/fs/gfs2/locking/nolock/main.c
@@ -13,7 +13,6 @@
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/types.h> 14#include <linux/types.h>
15#include <linux/fs.h> 15#include <linux/fs.h>
16#include <linux/smp_lock.h>
17#include <linux/lm_interface.h> 16#include <linux/lm_interface.h>
18 17
19struct nolock_lockspace { 18struct nolock_lockspace {
diff --git a/fs/gfs2/ops_dentry.c b/fs/gfs2/ops_dentry.c
index c6bac6b69420..a6fdc52f554a 100644
--- a/fs/gfs2/ops_dentry.c
+++ b/fs/gfs2/ops_dentry.c
@@ -11,7 +11,6 @@
11#include <linux/spinlock.h> 11#include <linux/spinlock.h>
12#include <linux/completion.h> 12#include <linux/completion.h>
13#include <linux/buffer_head.h> 13#include <linux/buffer_head.h>
14#include <linux/smp_lock.h>
15#include <linux/gfs2_ondisk.h> 14#include <linux/gfs2_ondisk.h>
16#include <linux/crc32.h> 15#include <linux/crc32.h>
17#include <linux/lm_interface.h> 16#include <linux/lm_interface.h>
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 329c4dcdecdb..064df8804582 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -15,7 +15,6 @@
15#include <linux/uio.h> 15#include <linux/uio.h>
16#include <linux/blkdev.h> 16#include <linux/blkdev.h>
17#include <linux/mm.h> 17#include <linux/mm.h>
18#include <linux/smp_lock.h>
19#include <linux/fs.h> 18#include <linux/fs.h>
20#include <linux/gfs2_ondisk.h> 19#include <linux/gfs2_ondisk.h>
21#include <linux/ext2_fs.h> 20#include <linux/ext2_fs.h>
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index be4648bc7a2f..1facfaff97cb 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -20,7 +20,6 @@
20#include <linux/slab.h> 20#include <linux/slab.h>
21#include <linux/mm.h> 21#include <linux/mm.h>
22#include <linux/pagemap.h> 22#include <linux/pagemap.h>
23#include <linux/smp_lock.h>
24 23
25/* 24/*
26 * Default IO end handler for temporary BJ_IO buffer_heads. 25 * Default IO end handler for temporary BJ_IO buffer_heads.
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 10fff9443938..e1eb7e999ae8 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -28,7 +28,6 @@
28#include <linux/jbd.h> 28#include <linux/jbd.h>
29#include <linux/errno.h> 29#include <linux/errno.h>
30#include <linux/slab.h> 30#include <linux/slab.h>
31#include <linux/smp_lock.h>
32#include <linux/init.h> 31#include <linux/init.h>
33#include <linux/mm.h> 32#include <linux/mm.h>
34#include <linux/freezer.h> 33#include <linux/freezer.h>
diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c
index d204ab394f36..a68cbb605022 100644
--- a/fs/jbd/revoke.c
+++ b/fs/jbd/revoke.c
@@ -66,7 +66,6 @@
66#include <linux/errno.h> 66#include <linux/errno.h>
67#include <linux/slab.h> 67#include <linux/slab.h>
68#include <linux/list.h> 68#include <linux/list.h>
69#include <linux/smp_lock.h>
70#include <linux/init.h> 69#include <linux/init.h>
71#endif 70#endif
72 71
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c
index cceaf57e3778..f9822fc07851 100644
--- a/fs/jbd/transaction.c
+++ b/fs/jbd/transaction.c
@@ -23,7 +23,6 @@
23#include <linux/errno.h> 23#include <linux/errno.h>
24#include <linux/slab.h> 24#include <linux/slab.h>
25#include <linux/timer.h> 25#include <linux/timer.h>
26#include <linux/smp_lock.h>
27#include <linux/mm.h> 26#include <linux/mm.h>
28#include <linux/highmem.h> 27#include <linux/highmem.h>
29 28
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 6bd8005e3d34..2856e1100a5f 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -20,7 +20,6 @@
20#include <linux/slab.h> 20#include <linux/slab.h>
21#include <linux/mm.h> 21#include <linux/mm.h>
22#include <linux/pagemap.h> 22#include <linux/pagemap.h>
23#include <linux/smp_lock.h>
24 23
25/* 24/*
26 * Default IO end handler for temporary BJ_IO buffer_heads. 25 * Default IO end handler for temporary BJ_IO buffer_heads.
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 44fc32bfd7f1..6b3158ec9e2c 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -28,7 +28,6 @@
28#include <linux/jbd2.h> 28#include <linux/jbd2.h>
29#include <linux/errno.h> 29#include <linux/errno.h>
30#include <linux/slab.h> 30#include <linux/slab.h>
31#include <linux/smp_lock.h>
32#include <linux/init.h> 31#include <linux/init.h>
33#include <linux/mm.h> 32#include <linux/mm.h>
34#include <linux/freezer.h> 33#include <linux/freezer.h>
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
index f506646ad0ff..1e864dcc49ea 100644
--- a/fs/jbd2/revoke.c
+++ b/fs/jbd2/revoke.c
@@ -66,7 +66,6 @@
66#include <linux/errno.h> 66#include <linux/errno.h>
67#include <linux/slab.h> 67#include <linux/slab.h>
68#include <linux/list.h> 68#include <linux/list.h>
69#include <linux/smp_lock.h>
70#include <linux/init.h> 69#include <linux/init.h>
71#endif 70#endif
72 71
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 3a8700153cb0..e347d8c078bc 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -23,7 +23,6 @@
23#include <linux/errno.h> 23#include <linux/errno.h>
24#include <linux/slab.h> 24#include <linux/slab.h>
25#include <linux/timer.h> 25#include <linux/timer.h>
26#include <linux/smp_lock.h>
27#include <linux/mm.h> 26#include <linux/mm.h>
28#include <linux/highmem.h> 27#include <linux/highmem.h>
29 28
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 5065baa530b6..783e80b5a8e7 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -62,7 +62,6 @@
62#include <linux/fs.h> 62#include <linux/fs.h>
63#include <linux/blkdev.h> 63#include <linux/blkdev.h>
64#include <linux/interrupt.h> 64#include <linux/interrupt.h>
65#include <linux/smp_lock.h>
66#include <linux/completion.h> 65#include <linux/completion.h>
67#include <linux/kthread.h> 66#include <linux/kthread.h>
68#include <linux/buffer_head.h> /* for sync_blockdev() */ 67#include <linux/buffer_head.h> /* for sync_blockdev() */
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 03893acbfda4..ce9ee6b4c0f6 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -44,7 +44,6 @@
44 44
45#include <linux/fs.h> 45#include <linux/fs.h>
46#include <linux/vmalloc.h> 46#include <linux/vmalloc.h>
47#include <linux/smp_lock.h>
48#include <linux/completion.h> 47#include <linux/completion.h>
49#include <linux/freezer.h> 48#include <linux/freezer.h>
50#include <linux/module.h> 49#include <linux/module.h>
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index a5c019e1a447..a10343bed160 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -12,7 +12,6 @@
12#include <linux/fs.h> 12#include <linux/fs.h>
13#include <linux/nfs_fs.h> 13#include <linux/nfs_fs.h>
14#include <linux/utsname.h> 14#include <linux/utsname.h>
15#include <linux/smp_lock.h>
16#include <linux/freezer.h> 15#include <linux/freezer.h>
17#include <linux/sunrpc/clnt.h> 16#include <linux/sunrpc/clnt.h>
18#include <linux/sunrpc/svc.h> 17#include <linux/sunrpc/svc.h>
diff --git a/fs/namei.c b/fs/namei.c
index aef62280b878..856b2f5da51d 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -22,7 +22,6 @@
22#include <linux/quotaops.h> 22#include <linux/quotaops.h>
23#include <linux/pagemap.h> 23#include <linux/pagemap.h>
24#include <linux/fsnotify.h> 24#include <linux/fsnotify.h>
25#include <linux/smp_lock.h>
26#include <linux/personality.h> 25#include <linux/personality.h>
27#include <linux/security.h> 26#include <linux/security.h>
28#include <linux/syscalls.h> 27#include <linux/syscalls.h>
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c
index 6b1f6d27099a..addfd3147ea7 100644
--- a/fs/ncpfs/file.c
+++ b/fs/ncpfs/file.c
@@ -17,7 +17,6 @@
17#include <linux/mm.h> 17#include <linux/mm.h>
18#include <linux/slab.h> 18#include <linux/slab.h>
19#include <linux/vmalloc.h> 19#include <linux/vmalloc.h>
20#include <linux/smp_lock.h>
21 20
22#include <linux/ncp_fs.h> 21#include <linux/ncp_fs.h>
23#include "ncplib_kernel.h" 22#include "ncplib_kernel.h"
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 5bd03b97002e..50c6821bad26 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -27,7 +27,6 @@
27#include <linux/nfs_mount.h> 27#include <linux/nfs_mount.h>
28#include <linux/nfs4_mount.h> 28#include <linux/nfs4_mount.h>
29#include <linux/lockd/bind.h> 29#include <linux/lockd/bind.h>
30#include <linux/smp_lock.h>
31#include <linux/seq_file.h> 30#include <linux/seq_file.h>
32#include <linux/mount.h> 31#include <linux/mount.h>
33#include <linux/nfs_idmap.h> 32#include <linux/nfs_idmap.h>
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 889de60f8a84..345aa5c0f382 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -41,7 +41,6 @@
41#include <linux/errno.h> 41#include <linux/errno.h>
42#include <linux/sched.h> 42#include <linux/sched.h>
43#include <linux/kernel.h> 43#include <linux/kernel.h>
44#include <linux/smp_lock.h>
45#include <linux/file.h> 44#include <linux/file.h>
46#include <linux/pagemap.h> 45#include <linux/pagemap.h>
47#include <linux/kref.h> 46#include <linux/kref.h>
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c
index 6ef268f7c300..234778576f09 100644
--- a/fs/nfs/getroot.c
+++ b/fs/nfs/getroot.c
@@ -25,7 +25,6 @@
25#include <linux/nfs_mount.h> 25#include <linux/nfs_mount.h>
26#include <linux/nfs4_mount.h> 26#include <linux/nfs4_mount.h>
27#include <linux/lockd/bind.h> 27#include <linux/lockd/bind.h>
28#include <linux/smp_lock.h>
29#include <linux/seq_file.h> 28#include <linux/seq_file.h>
30#include <linux/mount.h> 29#include <linux/mount.h>
31#include <linux/nfs_idmap.h> 30#include <linux/nfs_idmap.h>
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index 7d0371e2bad5..45268d6def2e 100644
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -16,7 +16,6 @@
16#include <linux/nfs_fs.h> 16#include <linux/nfs_fs.h>
17#include <linux/nfs_page.h> 17#include <linux/nfs_page.h>
18#include <linux/lockd/bind.h> 18#include <linux/lockd/bind.h>
19#include <linux/smp_lock.h>
20#include <linux/nfs_mount.h> 19#include <linux/nfs_mount.h>
21 20
22#include "iostat.h" 21#include "iostat.h"
diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c
index f5f4430fb2a4..0505ca124034 100644
--- a/fs/nfs/nfs4renewd.c
+++ b/fs/nfs/nfs4renewd.c
@@ -43,7 +43,6 @@
43 * child task framework of the RPC layer? 43 * child task framework of the RPC layer?
44 */ 44 */
45 45
46#include <linux/smp_lock.h>
47#include <linux/mm.h> 46#include <linux/mm.h>
48#include <linux/pagemap.h> 47#include <linux/pagemap.h>
49#include <linux/sunrpc/sched.h> 48#include <linux/sunrpc/sched.h>
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 1dcf56de9482..7be0ee2782cb 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -43,7 +43,6 @@
43#include <linux/nfs_fs.h> 43#include <linux/nfs_fs.h>
44#include <linux/nfs_page.h> 44#include <linux/nfs_page.h>
45#include <linux/lockd/bind.h> 45#include <linux/lockd/bind.h>
46#include <linux/smp_lock.h>
47#include "internal.h" 46#include "internal.h"
48 47
49#define NFSDBG_FACILITY NFSDBG_PROC 48#define NFSDBG_FACILITY NFSDBG_PROC
diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c
index bc2821331c29..83e865a16ad1 100644
--- a/fs/nfs/symlink.c
+++ b/fs/nfs/symlink.c
@@ -22,7 +22,6 @@
22#include <linux/mm.h> 22#include <linux/mm.h>
23#include <linux/slab.h> 23#include <linux/slab.h>
24#include <linux/string.h> 24#include <linux/string.h>
25#include <linux/smp_lock.h>
26#include <linux/namei.h> 25#include <linux/namei.h>
27 26
28/* Symlink caching in the page cache is even more simplistic 27/* Symlink caching in the page cache is even more simplistic
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 5d44b8bd1070..522cd413906e 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -21,7 +21,6 @@
21#include <linux/backing-dev.h> 21#include <linux/backing-dev.h>
22 22
23#include <asm/uaccess.h> 23#include <asm/uaccess.h>
24#include <linux/smp_lock.h>
25 24
26#include "delegation.h" 25#include "delegation.h"
27#include "internal.h" 26#include "internal.h"
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index e4a83d727afd..45aa21ce6784 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -46,7 +46,6 @@
46#include <linux/nfs4.h> 46#include <linux/nfs4.h>
47#include <linux/nfs_fs.h> 47#include <linux/nfs_fs.h>
48#include <linux/nfs_page.h> 48#include <linux/nfs_page.h>
49#include <linux/smp_lock.h>
50#include <linux/sunrpc/cache.h> 49#include <linux/sunrpc/cache.h>
51#include <linux/nfsd_idmap.h> 50#include <linux/nfsd_idmap.h>
52#include <linux/list.h> 51#include <linux/list.h>
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 5d090f11f2be..15809dfd88a5 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -44,7 +44,6 @@
44 44
45#include <linux/param.h> 45#include <linux/param.h>
46#include <linux/smp.h> 46#include <linux/smp.h>
47#include <linux/smp_lock.h>
48#include <linux/fs.h> 47#include <linux/fs.h>
49#include <linux/namei.h> 48#include <linux/namei.h>
50#include <linux/vfs.h> 49#include <linux/vfs.h>
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 8d995bcef806..739dd3c5c3b2 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -10,7 +10,6 @@
10 */ 10 */
11 11
12#include <linux/slab.h> 12#include <linux/slab.h>
13#include <linux/smp_lock.h>
14#include <linux/fs.h> 13#include <linux/fs.h>
15#include <linux/unistd.h> 14#include <linux/unistd.h>
16#include <linux/string.h> 15#include <linux/string.h>
diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
index 74f99a6a369b..34314b33dbd4 100644
--- a/fs/ntfs/dir.c
+++ b/fs/ntfs/dir.c
@@ -20,7 +20,6 @@
20 * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21 */ 21 */
22 22
23#include <linux/smp_lock.h>
24#include <linux/buffer_head.h> 23#include <linux/buffer_head.h>
25 24
26#include "dir.h" 25#include "dir.h"
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index f8bf8da67ee8..074791ce4ab2 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -27,7 +27,6 @@
27#include <linux/pagemap.h> 27#include <linux/pagemap.h>
28#include <linux/quotaops.h> 28#include <linux/quotaops.h>
29#include <linux/slab.h> 29#include <linux/slab.h>
30#include <linux/smp_lock.h>
31 30
32#include "aops.h" 31#include "aops.h"
33#include "attrib.h" 32#include "attrib.h"
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c
index d4e46d067edd..5671cf9d6383 100644
--- a/fs/ocfs2/dlm/dlmfs.c
+++ b/fs/ocfs2/dlm/dlmfs.c
@@ -42,7 +42,6 @@
42#include <linux/highmem.h> 42#include <linux/highmem.h>
43#include <linux/init.h> 43#include <linux/init.h>
44#include <linux/string.h> 44#include <linux/string.h>
45#include <linux/smp_lock.h>
46#include <linux/backing-dev.h> 45#include <linux/backing-dev.h>
47 46
48#include <asm/uaccess.h> 47#include <asm/uaccess.h>
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index 024777abc8e3..d1bd305ef0d7 100644
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -27,7 +27,6 @@
27#include <linux/slab.h> 27#include <linux/slab.h>
28#include <linux/highmem.h> 28#include <linux/highmem.h>
29#include <linux/mm.h> 29#include <linux/mm.h>
30#include <linux/smp_lock.h>
31#include <linux/crc32.h> 30#include <linux/crc32.h>
32#include <linux/kthread.h> 31#include <linux/kthread.h>
33#include <linux/pagemap.h> 32#include <linux/pagemap.h>
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index bc844bfe607c..c53a6763bbbe 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -28,7 +28,6 @@
28#include <linux/slab.h> 28#include <linux/slab.h>
29#include <linux/highmem.h> 29#include <linux/highmem.h>
30#include <linux/pagemap.h> 30#include <linux/pagemap.h>
31#include <linux/smp_lock.h>
32 31
33#include <asm/byteorder.h> 32#include <asm/byteorder.h>
34 33
diff --git a/fs/ocfs2/slot_map.c b/fs/ocfs2/slot_map.c
index d921a28329dc..d8b79067dc14 100644
--- a/fs/ocfs2/slot_map.c
+++ b/fs/ocfs2/slot_map.c
@@ -26,7 +26,6 @@
26#include <linux/types.h> 26#include <linux/types.h>
27#include <linux/slab.h> 27#include <linux/slab.h>
28#include <linux/highmem.h> 28#include <linux/highmem.h>
29#include <linux/smp_lock.h>
30 29
31#define MLOG_MASK_PREFIX ML_SUPER 30#define MLOG_MASK_PREFIX ML_SUPER
32#include <cluster/masklog.h> 31#include <cluster/masklog.h>
diff --git a/fs/ocfs2/vote.c b/fs/ocfs2/vote.c
index 4f82a2f0efef..66a13ee63d4c 100644
--- a/fs/ocfs2/vote.c
+++ b/fs/ocfs2/vote.c
@@ -26,7 +26,6 @@
26#include <linux/types.h> 26#include <linux/types.h>
27#include <linux/slab.h> 27#include <linux/slab.h>
28#include <linux/highmem.h> 28#include <linux/highmem.h>
29#include <linux/smp_lock.h>
30#include <linux/kthread.h> 29#include <linux/kthread.h>
31 30
32#include <cluster/heartbeat.h> 31#include <cluster/heartbeat.h>
diff --git a/fs/open.c b/fs/open.c
index c989fb4cf7b9..ca9981c4a658 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -7,7 +7,6 @@
7#include <linux/string.h> 7#include <linux/string.h>
8#include <linux/mm.h> 8#include <linux/mm.h>
9#include <linux/file.h> 9#include <linux/file.h>
10#include <linux/smp_lock.h>
11#include <linux/quotaops.h> 10#include <linux/quotaops.h>
12#include <linux/fsnotify.h> 11#include <linux/fsnotify.h>
13#include <linux/module.h> 12#include <linux/module.h>
diff --git a/fs/proc/base.c b/fs/proc/base.c
index ab1b439923e6..a3e77fb867ea 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -61,7 +61,6 @@
61#include <linux/namei.h> 61#include <linux/namei.h>
62#include <linux/mnt_namespace.h> 62#include <linux/mnt_namespace.h>
63#include <linux/mm.h> 63#include <linux/mm.h>
64#include <linux/smp_lock.h>
65#include <linux/rcupdate.h> 64#include <linux/rcupdate.h>
66#include <linux/kallsyms.h> 65#include <linux/kallsyms.h>
67#include <linux/module.h> 66#include <linux/module.h>
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 75ec6523d29a..9ad4978700e0 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -35,7 +35,6 @@
35#include <linux/signal.h> 35#include <linux/signal.h>
36#include <linux/module.h> 36#include <linux/module.h>
37#include <linux/init.h> 37#include <linux/init.h>
38#include <linux/smp_lock.h>
39#include <linux/seq_file.h> 38#include <linux/seq_file.h>
40#include <linux/times.h> 39#include <linux/times.h>
41#include <linux/profile.h> 40#include <linux/profile.h>
diff --git a/fs/quota.c b/fs/quota.c
index b9dae76a0b6e..e9d88fd0eca8 100644
--- a/fs/quota.c
+++ b/fs/quota.c
@@ -11,7 +11,6 @@
11#include <asm/current.h> 11#include <asm/current.h>
12#include <asm/uaccess.h> 12#include <asm/uaccess.h>
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/smp_lock.h>
15#include <linux/security.h> 14#include <linux/security.h>
16#include <linux/syscalls.h> 15#include <linux/syscalls.h>
17#include <linux/buffer_head.h> 16#include <linux/buffer_head.h>
diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c
index d3fd7c6732d2..3b481d557edb 100644
--- a/fs/ramfs/file-nommu.c
+++ b/fs/ramfs/file-nommu.c
@@ -16,7 +16,6 @@
16#include <linux/highmem.h> 16#include <linux/highmem.h>
17#include <linux/init.h> 17#include <linux/init.h>
18#include <linux/string.h> 18#include <linux/string.h>
19#include <linux/smp_lock.h>
20#include <linux/backing-dev.h> 19#include <linux/backing-dev.h>
21#include <linux/ramfs.h> 20#include <linux/ramfs.h>
22#include <linux/quotaops.h> 21#include <linux/quotaops.h>
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index ff1f7639707b..4ace5d72eae1 100644
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -30,7 +30,6 @@
30#include <linux/time.h> 30#include <linux/time.h>
31#include <linux/init.h> 31#include <linux/init.h>
32#include <linux/string.h> 32#include <linux/string.h>
33#include <linux/smp_lock.h>
34#include <linux/backing-dev.h> 33#include <linux/backing-dev.h>
35#include <linux/ramfs.h> 34#include <linux/ramfs.h>
36 35
diff --git a/fs/readdir.c b/fs/readdir.c
index f39f5b313252..71bd12b50b4c 100644
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -10,7 +10,6 @@
10#include <linux/errno.h> 10#include <linux/errno.h>
11#include <linux/stat.h> 11#include <linux/stat.h>
12#include <linux/file.h> 12#include <linux/file.h>
13#include <linux/smp_lock.h>
14#include <linux/fs.h> 13#include <linux/fs.h>
15#include <linux/dirent.h> 14#include <linux/dirent.h>
16#include <linux/security.h> 15#include <linux/security.h>
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
index 96a2f8889da3..9c23fee3bae9 100644
--- a/fs/reiserfs/dir.c
+++ b/fs/reiserfs/dir.c
@@ -7,7 +7,6 @@
7#include <linux/fs.h> 7#include <linux/fs.h>
8#include <linux/reiserfs_fs.h> 8#include <linux/reiserfs_fs.h>
9#include <linux/stat.h> 9#include <linux/stat.h>
10#include <linux/smp_lock.h>
11#include <linux/buffer_head.h> 10#include <linux/buffer_head.h>
12#include <asm/uaccess.h> 11#include <asm/uaccess.h>
13 12
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index abfada2f52db..ab45db529c80 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -6,7 +6,6 @@
6#include <linux/reiserfs_fs.h> 6#include <linux/reiserfs_fs.h>
7#include <linux/reiserfs_acl.h> 7#include <linux/reiserfs_acl.h>
8#include <linux/reiserfs_xattr.h> 8#include <linux/reiserfs_xattr.h>
9#include <linux/smp_lock.h>
10#include <asm/uaccess.h> 9#include <asm/uaccess.h>
11#include <linux/pagemap.h> 10#include <linux/pagemap.h>
12#include <linux/swap.h> 11#include <linux/swap.h>
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index a2161840bc7c..b378eea332ca 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -16,7 +16,6 @@
16#include <linux/reiserfs_fs.h> 16#include <linux/reiserfs_fs.h>
17#include <linux/reiserfs_acl.h> 17#include <linux/reiserfs_acl.h>
18#include <linux/reiserfs_xattr.h> 18#include <linux/reiserfs_xattr.h>
19#include <linux/smp_lock.h>
20#include <linux/quotaops.h> 19#include <linux/quotaops.h>
21 20
22#define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; } 21#define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
index 83b9135a411a..9aa7a06e093f 100644
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -16,7 +16,6 @@
16#include <asm/uaccess.h> 16#include <asm/uaccess.h>
17#include <linux/reiserfs_fs.h> 17#include <linux/reiserfs_fs.h>
18#include <linux/reiserfs_fs_sb.h> 18#include <linux/reiserfs_fs_sb.h>
19#include <linux/smp_lock.h>
20#include <linux/init.h> 19#include <linux/init.h>
21#include <linux/proc_fs.h> 20#include <linux/proc_fs.h>
22 21
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index afb21ea45302..b6f12593c39d 100644
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -53,7 +53,6 @@
53#include <linux/string.h> 53#include <linux/string.h>
54#include <linux/pagemap.h> 54#include <linux/pagemap.h>
55#include <linux/reiserfs_fs.h> 55#include <linux/reiserfs_fs.h>
56#include <linux/smp_lock.h>
57#include <linux/buffer_head.h> 56#include <linux/buffer_head.h>
58#include <linux/quotaops.h> 57#include <linux/quotaops.h>
59 58
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 5c58b419f4ee..c7762140c425 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -18,7 +18,6 @@
18#include <linux/reiserfs_fs.h> 18#include <linux/reiserfs_fs.h>
19#include <linux/reiserfs_acl.h> 19#include <linux/reiserfs_acl.h>
20#include <linux/reiserfs_xattr.h> 20#include <linux/reiserfs_xattr.h>
21#include <linux/smp_lock.h>
22#include <linux/init.h> 21#include <linux/init.h>
23#include <linux/blkdev.h> 22#include <linux/blkdev.h>
24#include <linux/buffer_head.h> 23#include <linux/buffer_head.h>
diff --git a/fs/select.c b/fs/select.c
index fe0893afd931..f163db20eb5a 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -17,7 +17,6 @@
17#include <linux/syscalls.h> 17#include <linux/syscalls.h>
18#include <linux/module.h> 18#include <linux/module.h>
19#include <linux/slab.h> 19#include <linux/slab.h>
20#include <linux/smp_lock.h>
21#include <linux/poll.h> 20#include <linux/poll.h>
22#include <linux/personality.h> /* for STICKY_TIMEOUTS */ 21#include <linux/personality.h> /* for STICKY_TIMEOUTS */
23#include <linux/file.h> 22#include <linux/file.h>
diff --git a/fs/smbfs/smbiod.c b/fs/smbfs/smbiod.c
index 89eaf31f1d46..3e61b44e51a9 100644
--- a/fs/smbfs/smbiod.c
+++ b/fs/smbfs/smbiod.c
@@ -16,7 +16,6 @@
16#include <linux/init.h> 16#include <linux/init.h>
17#include <linux/file.h> 17#include <linux/file.h>
18#include <linux/dcache.h> 18#include <linux/dcache.h>
19#include <linux/smp_lock.h>
20#include <linux/module.h> 19#include <linux/module.h>
21#include <linux/net.h> 20#include <linux/net.h>
22#include <linux/kthread.h> 21#include <linux/kthread.h>
diff --git a/fs/smbfs/sock.c b/fs/smbfs/sock.c
index 92ea6b2367d7..e48bd8235a8e 100644
--- a/fs/smbfs/sock.c
+++ b/fs/smbfs/sock.c
@@ -17,7 +17,6 @@
17#include <linux/net.h> 17#include <linux/net.h>
18#include <linux/mm.h> 18#include <linux/mm.h>
19#include <linux/netdevice.h> 19#include <linux/netdevice.h>
20#include <linux/smp_lock.h>
21#include <linux/workqueue.h> 20#include <linux/workqueue.h>
22#include <net/scm.h> 21#include <net/scm.h>
23#include <net/tcp_states.h> 22#include <net/tcp_states.h>
diff --git a/fs/smbfs/symlink.c b/fs/smbfs/symlink.c
index fea20ceb8a5f..00b2909bd469 100644
--- a/fs/smbfs/symlink.c
+++ b/fs/smbfs/symlink.c
@@ -13,7 +13,6 @@
13#include <linux/mm.h> 13#include <linux/mm.h>
14#include <linux/slab.h> 14#include <linux/slab.h>
15#include <linux/pagemap.h> 15#include <linux/pagemap.h>
16#include <linux/smp_lock.h>
17#include <linux/net.h> 16#include <linux/net.h>
18#include <linux/namei.h> 17#include <linux/namei.h>
19 18
diff --git a/fs/stat.c b/fs/stat.c
index 38a8cb2a28de..68510068a641 100644
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -8,7 +8,6 @@
8#include <linux/mm.h> 8#include <linux/mm.h>
9#include <linux/errno.h> 9#include <linux/errno.h>
10#include <linux/file.h> 10#include <linux/file.h>
11#include <linux/smp_lock.h>
12#include <linux/highuid.h> 11#include <linux/highuid.h>
13#include <linux/fs.h> 12#include <linux/fs.h>
14#include <linux/namei.h> 13#include <linux/namei.h>
diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c
index 4e48abbd2b5d..6bd850b7641a 100644
--- a/fs/sysv/namei.c
+++ b/fs/sysv/namei.c
@@ -13,7 +13,6 @@
13 */ 13 */
14 14
15#include <linux/pagemap.h> 15#include <linux/pagemap.h>
16#include <linux/smp_lock.h>
17#include "sysv.h" 16#include "sysv.h"
18 17
19static int add_nondir(struct dentry *dentry, struct inode *inode) 18static int add_nondir(struct dentry *dentry, struct inode *inode)
diff --git a/fs/udf/fsync.c b/fs/udf/fsync.c
index 5887d78cde43..6ded93e7c44f 100644
--- a/fs/udf/fsync.c
+++ b/fs/udf/fsync.c
@@ -21,7 +21,6 @@
21#include "udfdecl.h" 21#include "udfdecl.h"
22 22
23#include <linux/fs.h> 23#include <linux/fs.h>
24#include <linux/smp_lock.h>
25 24
26static int udf_fsync_inode(struct inode *, int); 25static int udf_fsync_inode(struct inode *, int);
27 26
diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c
index 4fb8b2e077ee..154452172f43 100644
--- a/fs/ufs/dir.c
+++ b/fs/ufs/dir.c
@@ -19,7 +19,6 @@
19#include <linux/time.h> 19#include <linux/time.h>
20#include <linux/fs.h> 20#include <linux/fs.h>
21#include <linux/ufs_fs.h> 21#include <linux/ufs_fs.h>
22#include <linux/smp_lock.h>
23 22
24#include "swab.h" 23#include "swab.h"
25#include "util.h" 24#include "util.h"
diff --git a/fs/xattr.c b/fs/xattr.c
index 38646132ab0e..9f4568b55b0f 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -9,7 +9,6 @@
9 */ 9 */
10#include <linux/fs.h> 10#include <linux/fs.h>
11#include <linux/slab.h> 11#include <linux/slab.h>
12#include <linux/smp_lock.h>
13#include <linux/file.h> 12#include <linux/file.h>
14#include <linux/xattr.h> 13#include <linux/xattr.h>
15#include <linux/namei.h> 14#include <linux/namei.h>