ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

init: rename mount_block_root to mount_root_generic

Browse Source 
mount_block_root is also used to mount non-block file systems, so give
it a better name.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230531125535.676098-7-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig
2023-05-31 14:55:17 +02:00
committed by Jens Axboe
parent f5524c3fad
commit e3102722ff
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
init/do_mounts.c
View File

@@ -391,7 +391,7 @@ out:
return ret; return ret;
} }
void __init mount_block_root(char *name, int flags) void __init mount_root_generic(char *name, int flags)
{ {
struct page *page = alloc_page(GFP_KERNEL); struct page *page = alloc_page(GFP_KERNEL);
char *fs_names = page_address(page); char *fs_names = page_address(page);
@@ -589,7 +589,7 @@ void __init mount_root(void)
if (err < 0) if (err < 0)
pr_emerg("Failed to create /dev/root: %d\n", err); pr_emerg("Failed to create /dev/root: %d\n", err);
mount_block_root("/dev/root", root_mountflags); mount_root_generic("/dev/root", root_mountflags);
} }
#endif #endif
} }
@@ -620,7 +620,7 @@ void __init prepare_namespace(void)
root_device_name = saved_root_name; root_device_name = saved_root_name;
if (!strncmp(root_device_name, "mtd", 3) || if (!strncmp(root_device_name, "mtd", 3) ||
!strncmp(root_device_name, "ubi", 3)) { !strncmp(root_device_name, "ubi", 3)) {
mount_block_root(root_device_name, root_mountflags); mount_root_generic(root_device_name, root_mountflags);
goto out; goto out;
} }
ROOT_DEV = name_to_dev_t(root_device_name); ROOT_DEV = name_to_dev_t(root_device_name);

2
init/do_mounts.h
View File

@@ -10,7 +10,7 @@
#include <linux/root_dev.h> #include <linux/root_dev.h>
#include <linux/init_syscalls.h> #include <linux/init_syscalls.h>
void mount_block_root(char *name, int flags); void mount_root_generic(char *name, int flags);
void mount_root(void); void mount_root(void);
extern int root_mountflags; extern int root_mountflags;

2
init/do_mounts_initrd.c
View File

@@ -95,7 +95,7 @@ static void __init handle_initrd(void)
real_root_dev = new_encode_dev(ROOT_DEV); real_root_dev = new_encode_dev(ROOT_DEV);
create_dev("/dev/root.old", Root_RAM0); create_dev("/dev/root.old", Root_RAM0);
/* mount initrd on rootfs' /root */ /* mount initrd on rootfs' /root */
mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY); mount_root_generic("/dev/root.old", root_mountflags & ~MS_RDONLY);
init_mkdir("/old", 0700); init_mkdir("/old", 0700);
init_chdir("/old"); init_chdir("/old");