From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <linux-kernel@vger.kernel.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
John McCutchan <john@johnmccutchan.com>,
Robert Love <rlove@rlove.org>, Eric Paris <eparis@parisplace.org>
Subject: [PATCH 02/11] fs/notify: don't use module_init for non-modular inotify_user code
Date: Sun, 31 May 2015 20:54:03 -0400 [thread overview]
Message-ID: <1433120052-18281-3-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1433120052-18281-1-git-send-email-paul.gortmaker@windriver.com>
The INOTIFY_USER option is bool, and hence this code is either
present or absent. It will never be modular, so using
module_init as an alias for __initcall is rather misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of fs_initcall (which
makes sense for fs code) will thus change this registration
from level 6-device to level 5-fs (i.e. slightly earlier).
However no observable impact of that small difference has
been observed during testing, or is expected.
Cc: John McCutchan <john@johnmccutchan.com>
Cc: Robert Love <rlove@rlove.org>
Cc: Eric Paris <eparis@parisplace.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
fs/notify/inotify/inotify_user.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 450648697433..5b1e2a497e51 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -26,7 +26,7 @@
#include <linux/fs.h> /* struct inode */
#include <linux/fsnotify_backend.h>
#include <linux/idr.h>
-#include <linux/init.h> /* module_init */
+#include <linux/init.h> /* fs_initcall */
#include <linux/inotify.h>
#include <linux/kernel.h> /* roundup() */
#include <linux/namei.h> /* LOOKUP_FOLLOW */
@@ -812,4 +812,4 @@ static int __init inotify_user_setup(void)
return 0;
}
-module_init(inotify_user_setup);
+fs_initcall(inotify_user_setup);
--
2.2.1
next prev parent reply other threads:[~2015-06-01 0:54 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 0:54 [PATCH 00/11] Replace module_init with an alternate initcall in non modules Paul Gortmaker
2015-06-01 0:54 ` [PATCH 01/11] mm: replace module_init usages with subsys_initcall in nommu.c Paul Gortmaker
2015-06-01 0:54 ` Paul Gortmaker [this message]
2015-06-01 0:54 ` [PATCH 03/11] netfilter: don't use module_init/exit in core IPV4 code Paul Gortmaker
2015-06-03 16:04 ` Pablo Neira Ayuso
2015-06-03 16:18 ` Paul Gortmaker
2015-06-01 0:54 ` [PATCH 04/11] x86: don't use module_init for non-modular core bootflag code Paul Gortmaker
2015-06-01 0:54 ` [PATCH 05/11] powerpc: use subsys_initcall for Freescale Local Bus Paul Gortmaker
2015-06-01 0:54 ` [PATCH 06/11] powerpc: don't use module_init for non-modular core hugetlb code Paul Gortmaker
2015-06-01 0:54 ` [PATCH 07/11] arm: use subsys_initcall in non-modular pl320 IPC code Paul Gortmaker
2015-06-01 0:54 ` [PATCH 08/11] lib/list_sort: use late_initcall to hook in self tests Paul Gortmaker
2015-06-01 0:54 ` [PATCH 09/11] mm/page_owner.c: use late_initcall to hook in enabling Paul Gortmaker
2015-06-01 0:54 ` [PATCH 10/11] x86: perf_event_intel_bts.c: use arch_initcall " Paul Gortmaker
2015-06-01 7:04 ` Peter Zijlstra
2015-06-01 14:11 ` Paul Gortmaker
2015-06-01 14:14 ` Peter Zijlstra
2015-06-01 15:35 ` Paul Gortmaker
2015-06-01 16:26 ` Peter Zijlstra
2015-06-01 0:54 ` [PATCH 11/11] x86: perf_event_intel_pt.c: " Paul Gortmaker
2015-06-01 7:05 ` Peter Zijlstra
2015-06-01 14:13 ` Paul Gortmaker
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=1433120052-18281-3-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=eparis@parisplace.org \
--cc=john@johnmccutchan.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rlove@rlove.org \
/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