| Message ID | 1449955812-10149-4-git-send-email-paul.gortmaker@windriver.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/fs/fcntl.c b/fs/fcntl.c index ee85cd4e136a..b485864eb357 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -13,7 +13,6 @@ #include <linux/capability.h> #include <linux/dnotify.h> #include <linux/slab.h> -#include <linux/module.h> #include <linux/pipe_fs_i.h> #include <linux/security.h> #include <linux/ptrace.h> @@ -755,5 +754,4 @@ static int __init fcntl_init(void) sizeof(struct fasync_struct), 0, SLAB_PANIC, NULL); return 0; } - -module_init(fcntl_init) +fs_initcall(fcntl_init)
The Makefile currently controlling compilation of this code is obj-y meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modularity so that when reading the code there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering gets bumped to one level earlier when we use the more appropriate fs_initcall here. However we've made similar changes before without any fallout and none is expected here either. We don't replace module.h with init.h since the file already has that. Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Jeff Layton <jlayton@poochiereds.net> Cc: "J. Bruce Fields" <bfields@fieldses.org> Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- fs/fcntl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)