From: Stefan Berger <stefanb@linux.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: zohar@linux.ibm.com, gregkh@linuxfoundation.org,
initramfs@vger.kernel.org, Stefan Berger <stefanb@linux.ibm.com>,
stable@vger.kernel.org, Rob Landley <rob@landley.net>
Subject: [PATCH v3] rootfs: Fix support for rootfstype= when root= is given
Date: Sun, 19 Nov 2023 20:12:48 -0500 [thread overview]
Message-ID: <20231120011248.396012-1-stefanb@linux.ibm.com> (raw)
Documentation/filesystems/ramfs-rootfs-initramfs.rst states:
If CONFIG_TMPFS is enabled, rootfs will use tmpfs instead of ramfs by
default. To force ramfs, add "rootfstype=ramfs" to the kernel command
line.
This currently does not work when root= is provided since then
saved_root_name contains a string and rootfstype= is ignored. Therefore,
ramfs is currently always chosen when root= is provided.
The current behavior for rootfs's filesystem is:
root= | rootfstype= | chosen rootfs filesystem
------------+-------------+--------------------------
unspecified | unspecified | tmpfs
unspecified | tmpfs | tmpfs
unspecified | ramfs | ramfs
provided | ignored | ramfs
rootfstype= should be respected regardless whether root= is given,
as shown below:
root= | rootfstype= | chosen rootfs filesystem
------------+-------------+--------------------------
unspecified | unspecified | tmpfs (as before)
unspecified | tmpfs | tmpfs (as before)
unspecified | ramfs | ramfs (as before)
provided | unspecified | ramfs (compatibility with before)
provided | tmpfs | tmpfs (new)
provided | ramfs | ramfs (new)
This table represents the new behavior.
Fixes: 6e19eded3684 ("initmpfs: use initramfs if rootfstype= or root= specified")
Cc: <stable@vger.kernel.org>
Signed-off-by: Rob Landley <rob@landley.net>
Link: https://lore.kernel.org/lkml/8244c75f-445e-b15b-9dbf-266e7ca666e2@landley.net/
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
v3:
- Changed initfstype= to rootfstype=
- Remove my R-b
v2:
- Cc'ing stable mailing list now
---
init/do_mounts.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 5fdef94f0864..279ad28bf4fb 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -510,7 +510,10 @@ struct file_system_type rootfs_fs_type = {
void __init init_rootfs(void)
{
- if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
- (!root_fs_names || strstr(root_fs_names, "tmpfs")))
- is_tmpfs = true;
+ if (IS_ENABLED(CONFIG_TMPFS)) {
+ if (!saved_root_name[0] && !root_fs_names)
+ is_tmpfs = true;
+ else if (root_fs_names && !!strstr(root_fs_names, "tmpfs"))
+ is_tmpfs = true;
+ }
}
--
2.41.0
next reply other threads:[~2023-11-20 1:13 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-20 1:12 Stefan Berger [this message]
2023-11-28 9:54 ` [PATCH v3] rootfs: Fix support for rootfstype= when root= is given Greg KH
2023-11-28 12:18 ` Mimi Zohar
2023-12-20 2:19 Askar Safin
2023-12-21 9:30 ` Rob Landley
2023-12-21 22:58 ` Askar Safin
2023-12-29 16:39 ` Stefan Berger
2023-12-29 18:35 ` Rob Landley
2023-12-29 19:14 ` Stefan Berger
2023-12-30 17:08 ` Rob Landley
2023-12-31 0:46 ` Askar Safin
2024-01-01 17:48 ` Rob Landley
2024-01-03 6:18 ` Askar Safin
2023-12-31 16:03 ` Stefan Berger
2024-01-01 1:15 ` Askar Safin
2024-01-01 18:50 ` Rob Landley
2024-01-02 13:03 ` Stefan Berger
2024-01-04 6:06 ` Askar Safin
2024-01-04 16:38 ` Rob Landley
2023-12-30 2:10 ` Askar Safin
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=20231120011248.396012-1-stefanb@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=initramfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rob@landley.net \
--cc=stable@vger.kernel.org \
--cc=zohar@linux.ibm.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.