Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

init: handle ubi/mtd root mounting like all other root types

Browse Source 
Assign a Root_Generic magic value for UBI/MTD root and handle the root
mounting in mount_root like all other root types.  Besides making the
code more clear this also means that UBI/MTD root can be used together
with an initrd (not that anyone should care).

Also factor parsing of the root name into a helper now that it can
be easily done and will get more complicated with subsequent patches.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230531125535.676098-11-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2023-05-31 14:55:21 +02:00 committed by Jens Axboe
parent 73231b58b1
commit 07d63cbb67
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/root_dev.h
View File

@ -9,6 +9,7 @@
enum {
Root_NFS = MKDEV(UNNAMED_MAJOR, 255),
Root_CIFS = MKDEV(UNNAMED_MAJOR, 254),
Root_Generic = MKDEV(UNNAMED_MAJOR, 253),
Root_RAM0 = MKDEV(RAMDISK_MAJOR, 0),
};

23
init/do_mounts.c
View File

@ -591,6 +591,10 @@ void __init mount_root(char *root_device_name)
case Root_CIFS:
mount_cifs_root();
break;
case Root_Generic:
mount_root_generic(root_device_name, root_device_name,
root_mountflags);
break;
case 0:
if (root_device_name && root_fs_names &&
mount_nodev_root(root_device_name) == 0)
@ -602,6 +606,14 @@ void __init mount_root(char *root_device_name)
}
}
static dev_t __init parse_root_device(char *root_device_name)
{
if (!strncmp(root_device_name, "mtd", 3) ||
!strncmp(root_device_name, "ubi", 3))
return Root_Generic;
return name_to_dev_t(root_device_name);
}
/*
* Prepare the namespace - decide what/where to mount, load ramdisks, etc.
*/
@ -624,15 +636,8 @@ void __init prepare_namespace(void)
md_run_setup();
if (saved_root_name[0]) {
if (!strncmp(saved_root_name, "mtd", 3) ||
!strncmp(saved_root_name, "ubi", 3)) {
mount_root_generic(saved_root_name, saved_root_name,
root_mountflags);
goto out;
}
ROOT_DEV = name_to_dev_t(saved_root_name);
}
if (saved_root_name[0])
ROOT_DEV = parse_root_device(saved_root_name);
if (initrd_load(saved_root_name))
goto out;