init: add an init_chdir helper

[linux-block.git] / init / do_mounts_initrd.c

diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 8b44dd017842a8929d7893a37b53eacae4ed6d0e..04627fd22a921fac08854c30b1fa0cf53a171648 100644 (file)
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -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();