All of lore.kernel.org
 help / color / mirror / Atom feed
From: menglong8.dong@gmail.com
To: mcgrof@kernel.org, josh@joshtriplett.org
Cc: viro@zeniv.linux.org.uk, keescook@chromium.org,
	samitolvanen@google.com, ojeda@kernel.org, johan@kernel.org,
	bhelgaas@google.com, masahiroy@kernel.org,
	dong.menglong@zte.com.cn, joe@perches.com, axboe@kernel.dk,
	hare@suse.de, jack@suse.cz, tj@kernel.org,
	gregkh@linuxfoundation.org, song@kernel.org, neilb@suse.de,
	akpm@linux-foundation.org, f.fainelli@gmail.com, arnd@arndb.de,
	linux@rasmusvillemoes.dk, wangkefeng.wang@huawei.com,
	brho@google.com, mhiramat@kernel.org, rostedt@goodmis.org,
	vbabka@suse.cz, glider@google.com, pmladek@suse.com,
	chris@chrisdown.name, ebiederm@xmission.com, jojing64@gmail.com,
	terrelln@fb.com, geert@linux-m68k.org, mingo@kernel.org,
	linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
	jeyu@kernel.org
Subject: [PATCH v2 1/3] init/main.c: introduce function ramdisk_exec_exist()
Date: Tue, 25 May 2021 22:15:22 +0800	[thread overview]
Message-ID: <20210525141524.3995-2-dong.menglong@zte.com.cn> (raw)
In-Reply-To: <20210525141524.3995-1-dong.menglong@zte.com.cn>

From: Menglong Dong <dong.menglong@zte.com.cn>

Introduce the function ramdisk_exec_exist, which is used to check
the exist of 'ramdisk_execute_command'.

Add the flag 'LOOKUP_DOWN' to 'init_eaccess' to make it follow the
mount on '/' while path lookup.

Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
---
 fs/init.c   | 2 +-
 init/main.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/fs/init.c b/fs/init.c
index 5c36adaa9b44..a1839fdcf467 100644
--- a/fs/init.c
+++ b/fs/init.c
@@ -115,7 +115,7 @@ int __init init_eaccess(const char *filename)
 	struct path path;
 	int error;
 
-	error = kern_path(filename, LOOKUP_FOLLOW, &path);
+	error = kern_path(filename, LOOKUP_FOLLOW | LOOKUP_DOWN, &path);
 	if (error)
 		return error;
 	error = path_permission(&path, MAY_ACCESS);
diff --git a/init/main.c b/init/main.c
index eb01e121d2f1..1153571ca977 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1522,6 +1522,11 @@ void __init console_on_rootfs(void)
 	fput(file);
 }
 
+bool __init ramdisk_exec_exist(void)
+{
+	return init_eaccess(ramdisk_execute_command) == 0;
+}
+
 static noinline void __init kernel_init_freeable(void)
 {
 	/*
@@ -1568,7 +1573,7 @@ static noinline void __init kernel_init_freeable(void)
 	 * check if there is an early userspace init.  If yes, let it do all
 	 * the work
 	 */
-	if (init_eaccess(ramdisk_execute_command) != 0) {
+	if (!ramdisk_exec_exist()) {
 		ramdisk_execute_command = NULL;
 		prepare_namespace();
 	}
-- 
2.32.0.rc0



  reply	other threads:[~2021-05-25 14:15 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-25 14:15 [PATCH v2 0/3] init/initramfs.c: make initramfs support pivot_root menglong8.dong
2021-05-25 14:15 ` menglong8.dong [this message]
2021-05-25 14:15 ` [PATCH v2 2/3] init/do_cmounts.c: introduce 'user_root' for initramfs menglong8.dong
2021-05-25 18:49   ` Eric W. Biederman
2021-05-26  1:51     ` Menglong Dong
2021-05-26  3:23       ` Eric W. Biederman
2021-05-26  4:32         ` Josh Triplett
2021-05-26  8:33           ` Menglong Dong
2021-05-26  9:03             ` Luis Chamberlain
2021-05-27  7:29               ` Menglong Dong
2021-05-26 22:33             ` Josh Triplett
2021-05-26  8:23         ` Menglong Dong
2021-05-25 14:15 ` [PATCH v2 3/3] init/do_mounts.c: fix rootfs_fs_type with ramfs menglong8.dong
2021-05-25 17:43 ` [PATCH v2 0/3] init/initramfs.c: make initramfs support pivot_root Josh Triplett
2021-05-28  7:10 ` Masami Hiramatsu
2021-05-28  7:37   ` Menglong Dong

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=20210525141524.3995-2-dong.menglong@zte.com.cn \
    --to=menglong8.dong@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=axboe@kernel.dk \
    --cc=bhelgaas@google.com \
    --cc=brho@google.com \
    --cc=chris@chrisdown.name \
    --cc=dong.menglong@zte.com.cn \
    --cc=ebiederm@xmission.com \
    --cc=f.fainelli@gmail.com \
    --cc=geert@linux-m68k.org \
    --cc=glider@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hare@suse.de \
    --cc=jack@suse.cz \
    --cc=jeyu@kernel.org \
    --cc=joe@perches.com \
    --cc=johan@kernel.org \
    --cc=jojing64@gmail.com \
    --cc=josh@joshtriplett.org \
    --cc=keescook@chromium.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@rasmusvillemoes.dk \
    --cc=masahiroy@kernel.org \
    --cc=mcgrof@kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@kernel.org \
    --cc=neilb@suse.de \
    --cc=ojeda@kernel.org \
    --cc=pmladek@suse.com \
    --cc=rostedt@goodmis.org \
    --cc=samitolvanen@google.com \
    --cc=song@kernel.org \
    --cc=terrelln@fb.com \
    --cc=tj@kernel.org \
    --cc=vbabka@suse.cz \
    --cc=viro@zeniv.linux.org.uk \
    --cc=wangkefeng.wang@huawei.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.