From: Jeff Layton <jlayton@poochiereds.net>
To: Paul Gortmaker <paul.gortmaker@windriver.com>,
Alexander Viro <viro@zeniv.linux.org.uk>
Cc: <linux-kernel@vger.kernel.org>,
"J. Bruce Fields" <bfields@fieldses.org>,
<linux-fsdevel@vger.kernel.org>
Subject: Re: [PATCH 05/10] fs: make locks.c explicitly non-modular
Date: Mon, 14 Dec 2015 06:31:05 -0500 [thread overview]
Message-ID: <20151214063105.2b4b624a@tlielax.poochiereds.net> (raw)
In-Reply-To: <1449955812-10149-6-git-send-email-paul.gortmaker@windriver.com>
On Sat, 12 Dec 2015 16:30:07 -0500
Paul Gortmaker <paul.gortmaker@windriver.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@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>
> ---
> fs/locks.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/locks.c b/fs/locks.c
> index fa76eb2910a9..15e2b60aa2d1 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>
> @@ -2702,7 +2701,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)
Looks fine to me and I doubt we'll see any merge conflicts with
anything I have queued so far. Do you need any of us to pick any of
these up or are you going to be merging them as a set?
Acked-by: Jeff Layton <jlayton@poochiereds.net>
next prev parent reply other threads:[~2015-12-14 11:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-12 21:30 [PATCH 00/10] fs: don't use module_init in non-modular code Paul Gortmaker
2015-12-12 21:30 ` [PATCH 01/10] fs: make notify dnotify.c explicitly non-modular Paul Gortmaker
2015-12-12 21:30 ` [PATCH 02/10] fs: make quota/netlink.c " Paul Gortmaker
2015-12-14 11:03 ` Jan Kara
2015-12-12 21:30 ` [PATCH 03/10] fs: make fcntl.c " Paul Gortmaker
2015-12-12 21:30 ` [PATCH 04/10] fs: make filesystems.c " Paul Gortmaker
2015-12-12 21:30 ` [PATCH 05/10] fs: make locks.c " Paul Gortmaker
2015-12-14 11:31 ` Jeff Layton [this message]
2015-12-14 15:34 ` Paul Gortmaker
2015-12-12 21:30 ` [PATCH 06/10] fs: make direct-io.c " Paul Gortmaker
2015-12-12 21:30 ` [PATCH 07/10] fs: make devpts/inode.c " Paul Gortmaker
2015-12-12 21:30 ` [PATCH 08/10] fs: make binfmt_elf.c " Paul Gortmaker
2015-12-12 21:30 ` [PATCH 09/10] fs: make hugetlbfs/inode.c " Paul Gortmaker
2015-12-14 16:14 ` Paul Gortmaker
2015-12-14 20:41 ` [PATCH v2] hugetlb: make mm and fs code " Paul Gortmaker
2015-12-12 21:30 ` [PATCH 10/10] fs: make quota/dquot.c " Paul Gortmaker
2015-12-14 11:05 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151214063105.2b4b624a@tlielax.poochiereds.net \
--to=jlayton@poochiereds.net \
--cc=bfields@fieldses.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®