[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20151218070710.00511173@tlielax.poochiereds.net>
Date: Fri, 18 Dec 2015 07:07:10 -0500
From: Jeff Layton <jlayton@...chiereds.net>
To: Paul Gortmaker <paul.gortmaker@...driver.com>
Cc: <linux-kernel@...r.kernel.org>,
"J. Bruce Fields" <bfields@...ldses.org>,
Alexander Viro <viro@...iv.linux.org.uk>,
<linux-fsdevel@...r.kernel.org>
Subject: Re: [PATCH 5/8] fs: make locks.c explicitly non-modular
On Thu, 17 Dec 2015 14:11:03 -0500
Paul Gortmaker <paul.gortmaker@...driver.com> wrote:
> 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@...chiereds.net>
> Acked-by: Jeff Layton <jlayton@...chiereds.net>
> Cc: "J. Bruce Fields" <bfields@...ldses.org>
> Cc: Alexander Viro <viro@...iv.linux.org.uk>
> Cc: linux-fsdevel@...r.kernel.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@...driver.com>
> ---
> fs/locks.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/locks.c b/fs/locks.c
> index 0d2b3267e2a3..869b64418a5b 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)
Thanks Paul, I'll pick this one up for v4.5.
--
Jeff Layton <jlayton@...chiereds.net>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists