From: menglong8.dong@gmail.com
To: christian.brauner@ubuntu.com
Cc: viro@zeniv.linux.org.uk, keescook@chromium.org,
samitolvanen@google.com, johan@kernel.org, ojeda@kernel.org,
akpm@linux-foundation.org, dong.menglong@zte.com.cn,
masahiroy@kernel.org, joe@perches.com, hare@suse.de,
axboe@kernel.dk, jack@suse.cz, tj@kernel.org,
gregkh@linuxfoundation.org, song@kernel.org, neilb@suse.de,
brho@google.com, mcgrof@kernel.org, palmerdabbelt@google.com,
arnd@arndb.de, f.fainelli@gmail.com, linux@rasmusvillemoes.dk,
wangkefeng.wang@huawei.com, mhiramat@kernel.org,
rostedt@goodmis.org, vbabka@suse.cz, pmladek@suse.com,
glider@google.com, chris@chrisdown.name, ebiederm@xmission.com,
jojing64@gmail.com, mingo@kernel.org, terrelln@fb.com,
geert@linux-m68k.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, jeyu@kernel.org,
bhelgaas@google.com, josh@joshtriplett.org
Subject: [PATCH v4 3/3] init/do_mounts.c: fix rootfs_fs_type with ramfs
Date: Wed, 2 Jun 2021 22:46:30 +0800 [thread overview]
Message-ID: <20210602144630.161982-4-dong.menglong@zte.com.cn> (raw)
In-Reply-To: <20210602144630.161982-1-dong.menglong@zte.com.cn>
From: Menglong Dong <dong.menglong@zte.com.cn>
As for the existence of second mount which is introduced in previous
patch, 'rootfs_fs_type', which is used as the root of mount tree, is
not used directly any more. So it make no sense to make it tmpfs
while 'CONFIG_INITRAMFS_MOUNT' is enabled.
Make 'rootfs_fs_type' ramfs when 'CONFIG_INITRAMFS_MOUNT' enabled.
Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
---
include/linux/init.h | 4 ++++
init/do_mounts.c | 16 ++++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/include/linux/init.h b/include/linux/init.h
index 045ad1650ed1..45ab6970851f 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -148,7 +148,11 @@ extern unsigned int reset_devices;
/* used by init/main.c */
void setup_arch(char **);
void prepare_namespace(void);
+#ifndef CONFIG_INITRAMFS_MOUNT
void __init init_rootfs(void);
+#else
+static inline void __init init_rootfs(void) { }
+#endif
extern struct file_system_type rootfs_fs_type;
#if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_STRICT_MODULE_RWX)
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 5f82db43ac0f..fcdc849a102a 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -700,7 +700,10 @@ void __init finish_mount_rootfs(bool success)
init_chdir("/");
init_umount(".", 0);
}
-#endif
+
+#define rootfs_init_fs_context ramfs_init_fs_context
+
+#else
static bool is_tmpfs;
static int rootfs_init_fs_context(struct fs_context *fc)
@@ -711,13 +714,14 @@ static int rootfs_init_fs_context(struct fs_context *fc)
return ramfs_init_fs_context(fc);
}
+void __init init_rootfs(void)
+{
+ is_tmpfs = check_tmpfs_enabled();
+}
+#endif
+
struct file_system_type rootfs_fs_type = {
.name = "rootfs",
.init_fs_context = rootfs_init_fs_context,
.kill_sb = kill_litter_super,
};
-
-void __init init_rootfs(void)
-{
- is_tmpfs = check_tmpfs_enabled();
-}
--
2.32.0.rc0
prev parent reply other threads:[~2021-06-02 14:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 14:46 [PATCH v4 0/3] init/initramfs.c: make initramfs support pivot_root menglong8.dong
2021-06-02 14:46 ` [PATCH v4 1/3] init/main.c: introduce function ramdisk_exec_exist() menglong8.dong
2021-06-02 14:46 ` [PATCH v4 2/3] init/do_mounts.c: create second mount for initramfs menglong8.dong
2021-06-03 13:30 ` Christian Brauner
2021-06-03 15:05 ` Menglong Dong
2021-06-04 9:59 ` Christian Brauner
2021-06-02 14:46 ` menglong8.dong [this message]
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=20210602144630.161982-4-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=christian.brauner@ubuntu.com \
--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=palmerdabbelt@google.com \
--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 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®