summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-07-23 08:23:40 +0200
committerChristoph Hellwig <hch@lst.de>2020-07-31 08:17:52 +0200
commit8fb9f73e5a539ab3aa4785f30fb52c65fa98600c (patch)
tree81f6cb5c68284eb39e7798602e5dc329933ad768 /init
parent09267defa36aaff6ff829bd2fc8b043ec151cc3e (diff)
downloadlinux-8fb9f73e5a539ab3aa4785f30fb52c65fa98600c.tar.gz
init: add an init_unlink helper
Add a simple helper to unlink with a kernel space file name and switch the early init code over to it. Remove the now unused ksys_unlink. Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts.h2
-rw-r--r--init/do_mounts_initrd.c4
-rw-r--r--init/do_mounts_rd.c2
-rw-r--r--init/initramfs.c3
4 files changed, 6 insertions, 5 deletions
diff --git a/init/do_mounts.h b/init/do_mounts.h
index 20e7fec8cb49..104d8431725a 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -16,7 +16,7 @@ extern int root_mountflags;
static inline __init int create_dev(char *name, dev_t dev)
{
- ksys_unlink(name);
+ init_unlink(name);
return ksys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
}
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 6b020a069902..8b44dd017842 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -137,11 +137,11 @@ bool __init initrd_load(void)
* mounted in the normal path.
*/
if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
- ksys_unlink("/initrd.image");
+ init_unlink("/initrd.image");
handle_initrd();
return true;
}
}
- ksys_unlink("/initrd.image");
+ init_unlink("/initrd.image");
return false;
}
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index d4255c10432a..ac021ae6e6fa 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -272,7 +272,7 @@ noclose_input:
fput(out_file);
out:
kfree(buf);
- ksys_unlink("/dev/ram");
+ init_unlink("/dev/ram");
return res;
}
diff --git a/init/initramfs.c b/init/initramfs.c
index 9820fca4d4e3..eb58cee6dadb 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -12,6 +12,7 @@
#include <linux/file.h>
#include <linux/memblock.h>
#include <linux/namei.h>
+#include <linux/init_syscalls.h>
static ssize_t __init xwrite(struct file *file, const char *p, size_t count,
loff_t *pos)
@@ -301,7 +302,7 @@ static void __init clean_path(char *path, umode_t fmode)
if (S_ISDIR(st.mode))
ksys_rmdir(path);
else
- ksys_unlink(path);
+ init_unlink(path);
}
}