From: Rob Landley <rob@landley.net>
To: linux-kernel@vger.kernel.org
Cc: Al Viro <viro@zeniv.linux.org.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jens Axboe <axboe@kernel.dk>, Stephen Warren <swarren@nvidia.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH 5/5] initmpfs v2: Use initramfs if rootfstype= or root= specified.
Date: Tue, 16 Jul 2013 16:45:39 -0700 (PDT) [thread overview]
Message-ID: <1374018312.367663@landley.net> (raw)
In-Reply-To: <1374018312.366617@landley.net>
From: Rob Landley <rob@landley.net>
Command line option rootfstype=ramfs to obtain old initramfs behavior,
and use ramfs instead of tmpfs for stub when root= defined (for cosmetic
reasons).
Signed-off-by: Rob Landley <rob@landley.net>
---
init/do_mounts.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
--- initold/init/do_mounts.c 2013-06-29 13:27:00.485256840 -0500
+++ initwork/init/do_mounts.c 2013-06-29 13:34:17.925275072 -0500
@@ -591,16 +591,20 @@
sys_chroot(".");
}
+static bool is_tmpfs;
static struct dentry *rootfs_mount(struct file_system_type *fs_type,
int flags, const char *dev_name, void *data)
{
static unsigned long once;
+ void *fill = ramfs_fill_super;
if (test_and_set_bit(1, &once))
return ERR_PTR(-ENODEV);
- return mount_nodev(fs_type, flags, data,
- IS_ENABLED(CONFIG_TMPFS) ? shmem_fill_super : ramfs_fill_super);
+ if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs)
+ fill = shmem_fill_super;
+
+ return mount_nodev(fs_type, flags, data, fill);
}
static struct file_system_type rootfs_fs_type = {
@@ -616,9 +620,12 @@
if (err)
return err;
- if (IS_ENABLED(CONFIG_TMPFS))
+ if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
+ (!root_fs_names || strstr(root_fs_names, "tmpfs")))
+ {
err = shmem_init();
- else
+ is_tmpfs = true;
+ } else
err = init_ramfs_fs();
if (err)
next prev parent reply other threads:[~2013-07-16 23:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-16 23:45 [PATCH 0/5] initmpfs v2: use tmpfs instead of ramfs for rootfs Rob Landley
2013-07-16 23:45 ` [PATCH 1/5] initmpfs v2: replace MS_NOUSER in initramfs Rob Landley
2013-07-16 23:45 ` [PATCH 2/5] initmpfs v2: Move bdi setup from init_rootfs to init_ramfs Rob Landley
2013-07-16 23:45 ` [PATCH 3/5] initmpfs v2: Move rootfs code from fs/ramfs/ to init/ Rob Landley
2013-07-16 23:45 ` [PATCH 4/5] initmpfs v2: Make rootfs use tmpfs when CONFIG_TMPFS enabled Rob Landley
2013-07-16 23:45 ` Rob Landley [this message]
2013-07-19 19:57 ` [PATCH 5/5] initmpfs v2: Use initramfs if rootfstype= or root= specified Andrew Morton
2013-07-26 4:12 ` Rob Landley
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=1374018312.367663@landley.net \
--to=rob@landley.net \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=swarren@nvidia.com \
--cc=viro@zeniv.linux.org.uk \
/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