From: Christoph Hellwig <hch@infradead.org>
To: Vivek Goyal <vgoyal@redhat.com>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
virtio-fs@redhat.com, miklos@szeredi.hu, stefanha@redhat.com,
dgilbert@redhat.com, viro@zeniv.linux.org.uk,
dhowells@redhat.com, richard.weinberger@gmail.com,
hch@infradead.org, asmadeus@codewreck.org,
v9fs-developer@lists.sourceforge.net
Subject: Re: [PATCH v2 0/2] Add support to boot virtiofs and 9pfs as rootfs
Date: Thu, 17 Jun 2021 11:14:00 +0100 [thread overview]
Message-ID: <YMsgaPS90iKIqSvi@infradead.org> (raw)
In-Reply-To: <20210614174454.903555-1-vgoyal@redhat.com>
Why not something like the version below that should work for all nodev
file systems?
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 74aede860de7..3c5676603fef 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -530,6 +530,39 @@ static int __init mount_cifs_root(void)
}
#endif
+static int __init mount_nodev_root(void)
+{
+ struct file_system_type *fs = get_fs_type(root_fs_names);
+ char *fs_names, *p;
+ int err = -ENODEV;
+
+ if (!fs)
+ goto out;
+ if (fs->fs_flags & FS_REQUIRES_DEV)
+ goto out_put_filesystem;
+
+ fs_names = (void *)__get_free_page(GFP_KERNEL);
+ if (!fs_names)
+ goto out_put_filesystem;
+ get_fs_names(fs_names);
+
+ for (p = fs_names; *p; p += strlen(p) + 1) {
+ err = do_mount_root(root_device_name, p, root_mountflags,
+ root_mount_data);
+ if (!err)
+ break;
+ if (err != -EACCES && err != -EINVAL)
+ panic("VFS: Unable to mount root \"%s\" (%s), err=%d\n",
+ root_device_name, p, err);
+ }
+
+ free_page((unsigned long)fs_names);
+out_put_filesystem:
+ put_filesystem(fs);
+out:
+ return err;
+}
+
void __init mount_root(void)
{
#ifdef CONFIG_ROOT_NFS
@@ -546,6 +579,8 @@ void __init mount_root(void)
return;
}
#endif
+ if (ROOT_DEV == 0 && mount_nodev_root() == 0)
+ return;
#ifdef CONFIG_BLOCK
{
int err = create_dev("/dev/root", ROOT_DEV);
next prev parent reply other threads:[~2021-06-17 10:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-14 17:44 [PATCH v2 0/2] Add support to boot virtiofs and 9pfs as rootfs Vivek Goyal
2021-06-14 17:44 ` [PATCH v2 1/2] init/do_mounts.c: Add a path to boot from tag based filesystems Vivek Goyal
2021-06-18 7:07 ` Miklos Szeredi
2021-06-18 12:53 ` Vivek Goyal
2021-06-14 17:44 ` [PATCH v2 2/2] init/do_mounts.c: Add 9pfs to the list of " Vivek Goyal
2021-06-17 10:14 ` Christoph Hellwig [this message]
2021-06-17 13:30 ` [PATCH v2 0/2] Add support to boot virtiofs and 9pfs as rootfs Vivek Goyal
2021-06-17 14:25 ` Christoph Hellwig
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=YMsgaPS90iKIqSvi@infradead.org \
--to=hch@infradead.org \
--cc=asmadeus@codewreck.org \
--cc=dgilbert@redhat.com \
--cc=dhowells@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=richard.weinberger@gmail.com \
--cc=stefanha@redhat.com \
--cc=v9fs-developer@lists.sourceforge.net \
--cc=vgoyal@redhat.com \
--cc=viro@zeniv.linux.org.uk \
--cc=virtio-fs@redhat.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;
as well as URLs for NNTP newsgroup(s).