summaryrefslogtreecommitdiffstats
path: root/init/do_mounts_initrd.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2018-03-11 11:34:46 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2018-04-02 20:15:51 +0200
commit447016e9681965fda8dcd9e4fd3c55308a6fd166 (patch)
tree02db8c01fa405f0f16ba09bbee415cdf15e30b14 /init/do_mounts_initrd.c
parente7a3e8b2edf544ec28f689385c3adc2903f46ec0 (diff)
downloadlinux-447016e9681965fda8dcd9e4fd3c55308a6fd166.tar.bz2
fs: add ksys_chdir() helper; remove in-kernel calls to sys_chdir()
Using this helper allows us to avoid the in-kernel calls to the sys_chdir() syscall. The ksys_ prefix denotes that this function is meant as a drop-in replacement for the syscall. In particular, it uses the same calling convention as sys_chdir(). This patch is part of a series which removes in-kernel calls to syscalls. On this basis, the syscall entry path can be streamlined. For details, see http://lkml.kernel.org/r/20180325162527.GA17492@light.dominikbrodowski.net Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'init/do_mounts_initrd.c')
-rw-r--r--init/do_mounts_initrd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 71293265ac4b..83f396d30b9a 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -42,7 +42,7 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
ksys_dup(0);
ksys_dup(0);
/* move initrd over / and chdir/chroot in initrd root */
- sys_chdir("/root");
+ ksys_chdir("/root");
ksys_mount(".", "/", NULL, MS_MOVE, NULL);
ksys_chroot(".");
sys_setsid();
@@ -61,7 +61,7 @@ static void __init handle_initrd(void)
/* mount initrd on rootfs' /root */
mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
sys_mkdir("/old", 0700);
- sys_chdir("/old");
+ ksys_chdir("/old");
/* try loading default modules from initrd */
load_default_modules();
@@ -86,11 +86,11 @@ static void __init handle_initrd(void)
ksys_chroot("..");
if (new_decode_dev(real_root_dev) == Root_RAM0) {
- sys_chdir("/old");
+ ksys_chdir("/old");
return;
}
- sys_chdir("/");
+ ksys_chdir("/");
ROOT_DEV = new_decode_dev(real_root_dev);
mount_root();