summaryrefslogtreecommitdiffstats
path: root/fs/locks.c
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2015-12-17 14:11:03 -0500
committerJeff Layton <jeff.layton@primarydata.com>2015-12-18 07:05:06 -0500
commit9189922675ecca0fab38931d86b676e9d79602dc (patch)
treee4bde5c496e2e11e731d71e59cc59b1a52b51205 /fs/locks.c
parent8ace5dfb983e89dbcfcb42ff25df6e4240c555bb (diff)
downloadlinux-stable-9189922675ecca0fab38931d86b676e9d79602dc.tar.gz
linux-stable-9189922675ecca0fab38931d86b676e9d79602dc.tar.bz2
linux-stable-9189922675ecca0fab38931d86b676e9d79602dc.zip
fs: make locks.c explicitly non-modular
The Kconfig currently controlling compilation of this code is: config FILE_LOCKING bool "Enable POSIX file locking API" if EXPERT ...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 driver 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. Cc: Jeff Layton <jlayton@poochiereds.net> Acked-by: Jeff Layton <jlayton@poochiereds.net> Cc: "J. Bruce Fields" <bfields@fieldses.org> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Diffstat (limited to 'fs/locks.c')
-rw-r--r--fs/locks.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/locks.c b/fs/locks.c
index d2ee8e365ba7..593dca300b29 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -119,7 +119,6 @@
#include <linux/fdtable.h>
#include <linux/fs.h>
#include <linux/init.h>
-#include <linux/module.h>
#include <linux/security.h>
#include <linux/slab.h>
#include <linux/syscalls.h>
@@ -2706,7 +2705,7 @@ static int __init proc_locks_init(void)
proc_create("locks", 0, NULL, &proc_locks_operations);
return 0;
}
-module_init(proc_locks_init);
+fs_initcall(proc_locks_init);
#endif
static int __init filelock_init(void)