diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 11:46:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 11:46:57 -0400 |
commit | feb72ce827b939d5228664c92c2dfed7753cae46 (patch) | |
tree | de2d78ee45d9e0df234e98eea67ebc3a21525d8f /fs/adfs/super.c | |
parent | 65795efbd380a832ae508b04dba8f8e53f0b84d9 (diff) | |
parent | 5ac3455a843d2ca77333c954eea83aa4514c8199 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
get rid of BKL in fs/sysv
get rid of BKL in fs/minix
get rid of BKL in fs/efs
befs ->pust_super() doesn't need BKL
Cleanup of adfs headers
9P doesn't need BKL in ->umount_begin()
fuse doesn't need BKL in ->umount_begin()
No instance of ->bmap() needs BKL
remove unlock_kernel() left accidentally
ext4: avoid unnecessary spinlock in critical POSIX ACL path
ext3: avoid unnecessary spinlock in critical POSIX ACL path
Diffstat (limited to 'fs/adfs/super.c')
-rw-r--r-- | fs/adfs/super.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/fs/adfs/super.c b/fs/adfs/super.c index 0ec5aaf47aa7..aad92f0a1048 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c | |||
@@ -8,26 +8,12 @@ | |||
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
11 | #include <linux/errno.h> | ||
12 | #include <linux/fs.h> | ||
13 | #include <linux/adfs_fs.h> | ||
14 | #include <linux/slab.h> | ||
15 | #include <linux/time.h> | ||
16 | #include <linux/stat.h> | ||
17 | #include <linux/string.h> | ||
18 | #include <linux/init.h> | 11 | #include <linux/init.h> |
19 | #include <linux/buffer_head.h> | 12 | #include <linux/buffer_head.h> |
20 | #include <linux/vfs.h> | ||
21 | #include <linux/parser.h> | 13 | #include <linux/parser.h> |
22 | #include <linux/bitops.h> | ||
23 | #include <linux/mount.h> | 14 | #include <linux/mount.h> |
24 | #include <linux/seq_file.h> | 15 | #include <linux/seq_file.h> |
25 | 16 | #include <linux/statfs.h> | |
26 | #include <asm/uaccess.h> | ||
27 | #include <asm/system.h> | ||
28 | |||
29 | #include <stdarg.h> | ||
30 | |||
31 | #include "adfs.h" | 17 | #include "adfs.h" |
32 | #include "dir_f.h" | 18 | #include "dir_f.h" |
33 | #include "dir_fplus.h" | 19 | #include "dir_fplus.h" |
@@ -534,3 +520,4 @@ static void __exit exit_adfs_fs(void) | |||
534 | 520 | ||
535 | module_init(init_adfs_fs) | 521 | module_init(init_adfs_fs) |
536 | module_exit(exit_adfs_fs) | 522 | module_exit(exit_adfs_fs) |
523 | MODULE_LICENSE("GPL"); | ||