xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init: add an init_chdir helper

Browse Source 
Add a simple helper to chdir with a kernel space file name and switch
the early init code over to it.  Remove the now unused ksys_chdir.

Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Christoph Hellwig
2020-07-22 11:25:21 +02:00
parent 20cce026c3
commit db63f1e315
7 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
init/do_mounts.c
View File

@@ -408,7 +408,7 @@ static int __init do_mount_root(const char *name, const char *fs,
if (ret)
goto out;
ksys_chdir("/root");
init_chdir("/root");
s = current->fs->pwd.dentry->d_sb;
ROOT_DEV = s->s_dev;
printk(KERN_INFO

8
init/do_mounts_initrd.c
View File

@@ -61,7 +61,7 @@ static int __init init_linuxrc(struct subprocess_info *info, struct cred *new)
ksys_unshare(CLONE_FS | CLONE_FILES);
console_on_rootfs();
/* move initrd over / and chdir/chroot in initrd root */
ksys_chdir("/root");
init_chdir("/root");
init_mount(".", "/", NULL, MS_MOVE, NULL);
ksys_chroot(".");
ksys_setsid();
@@ -82,7 +82,7 @@ static void __init handle_initrd(void)
/* mount initrd on rootfs' /root */
mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
ksys_mkdir("/old", 0700);
ksys_chdir("/old");
init_chdir("/old");
/*
* In case that a resume from disk is carried out by linuxrc or one of
@@ -104,11 +104,11 @@ static void __init handle_initrd(void)
ksys_chroot("..");
if (new_decode_dev(real_root_dev) == Root_RAM0) {
ksys_chdir("/old");
init_chdir("/old");
return;
}
ksys_chdir("/");
init_chdir("/");
ROOT_DEV = new_decode_dev(real_root_dev);
mount_root();