Commit 91899226 authored Dec 17, 2015 by Paul Gortmaker Committed by Jeff Layton Dec 18, 2015

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>

parent 8ace5dfb

fs/locks.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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)

Admin message