diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-01-04 15:59:47 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2012-01-09 07:52:10 -0500 |
commit | 302bf2f3259948c93361d501b04a5ed69c3bd4f8 (patch) | |
tree | 22ccdf5774a28476745a94532b5ce2c2cc454d98 /fs/ext2 | |
parent | 6c2155b9cc5a193e85194bbeaae2e2e4512dd597 (diff) |
ext2/3/4: delete unneeded includes of module.h
Delete any instances of include module.h that were not strictly
required. In the case of ext2, the declaration of MODULE_LICENSE
etc. were in inode.c but the module_init/exit were in super.c, so
relocate the MODULE_LICENCE/AUTHOR block to super.c which makes it
consistent with ext3 and ext4 at the same time.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext2')
-rw-r--r-- | fs/ext2/inode.c | 5 | ||||
-rw-r--r-- | fs/ext2/super.c | 3 | ||||
-rw-r--r-- | fs/ext2/xattr.c | 1 | ||||
-rw-r--r-- | fs/ext2/xattr_security.c | 1 | ||||
-rw-r--r-- | fs/ext2/xattr_trusted.c | 1 | ||||
-rw-r--r-- | fs/ext2/xattr_user.c | 1 |
6 files changed, 3 insertions, 9 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 91a6945af6d..740cad8dcd8 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/highuid.h> | 26 | #include <linux/highuid.h> |
27 | #include <linux/pagemap.h> | 27 | #include <linux/pagemap.h> |
28 | #include <linux/quotaops.h> | 28 | #include <linux/quotaops.h> |
29 | #include <linux/module.h> | ||
30 | #include <linux/writeback.h> | 29 | #include <linux/writeback.h> |
31 | #include <linux/buffer_head.h> | 30 | #include <linux/buffer_head.h> |
32 | #include <linux/mpage.h> | 31 | #include <linux/mpage.h> |
@@ -36,10 +35,6 @@ | |||
36 | #include "acl.h" | 35 | #include "acl.h" |
37 | #include "xip.h" | 36 | #include "xip.h" |
38 | 37 | ||
39 | MODULE_AUTHOR("Remy Card and others"); | ||
40 | MODULE_DESCRIPTION("Second Extended Filesystem"); | ||
41 | MODULE_LICENSE("GPL"); | ||
42 | |||
43 | static int __ext2_write_inode(struct inode *inode, int do_sync); | 38 | static int __ext2_write_inode(struct inode *inode, int do_sync); |
44 | 39 | ||
45 | /* | 40 | /* |
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index bd8ac164a3b..9e7e203146b 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
@@ -1521,5 +1521,8 @@ static void __exit exit_ext2_fs(void) | |||
1521 | exit_ext2_xattr(); | 1521 | exit_ext2_xattr(); |
1522 | } | 1522 | } |
1523 | 1523 | ||
1524 | MODULE_AUTHOR("Remy Card and others"); | ||
1525 | MODULE_DESCRIPTION("Second Extended Filesystem"); | ||
1526 | MODULE_LICENSE("GPL"); | ||
1524 | module_init(init_ext2_fs) | 1527 | module_init(init_ext2_fs) |
1525 | module_exit(exit_ext2_fs) | 1528 | module_exit(exit_ext2_fs) |
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c index d27b71f1d18..6dcafc7efdf 100644 --- a/fs/ext2/xattr.c +++ b/fs/ext2/xattr.c | |||
@@ -54,7 +54,6 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | #include <linux/buffer_head.h> | 56 | #include <linux/buffer_head.h> |
57 | #include <linux/module.h> | ||
58 | #include <linux/init.h> | 57 | #include <linux/init.h> |
59 | #include <linux/slab.h> | 58 | #include <linux/slab.h> |
60 | #include <linux/mbcache.h> | 59 | #include <linux/mbcache.h> |
diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c index c922adc8ef4..be7a8d02c9a 100644 --- a/fs/ext2/xattr_security.c +++ b/fs/ext2/xattr_security.c | |||
@@ -3,7 +3,6 @@ | |||
3 | * Handler for storing security labels as extended attributes. | 3 | * Handler for storing security labels as extended attributes. |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <linux/module.h> | ||
7 | #include <linux/slab.h> | 6 | #include <linux/slab.h> |
8 | #include <linux/string.h> | 7 | #include <linux/string.h> |
9 | #include <linux/fs.h> | 8 | #include <linux/fs.h> |
diff --git a/fs/ext2/xattr_trusted.c b/fs/ext2/xattr_trusted.c index 667e46a8d62..2989467d359 100644 --- a/fs/ext2/xattr_trusted.c +++ b/fs/ext2/xattr_trusted.c | |||
@@ -5,7 +5,6 @@ | |||
5 | * Copyright (C) 2003 by Andreas Gruenbacher, <a.gruenbacher@computer.org> | 5 | * Copyright (C) 2003 by Andreas Gruenbacher, <a.gruenbacher@computer.org> |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/module.h> | ||
9 | #include <linux/string.h> | 8 | #include <linux/string.h> |
10 | #include <linux/capability.h> | 9 | #include <linux/capability.h> |
11 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
diff --git a/fs/ext2/xattr_user.c b/fs/ext2/xattr_user.c index 099d20f4716..f470e44c4b8 100644 --- a/fs/ext2/xattr_user.c +++ b/fs/ext2/xattr_user.c | |||
@@ -6,7 +6,6 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
9 | #include <linux/module.h> | ||
10 | #include <linux/string.h> | 9 | #include <linux/string.h> |
11 | #include "ext2.h" | 10 | #include "ext2.h" |
12 | #include "xattr.h" | 11 | #include "xattr.h" |