mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-25 03:22:39 +00:00
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>
This commit is contained in:
@@ -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));
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -272,7 +272,7 @@ noclose_input:
|
||||
fput(out_file);
|
||||
out:
|
||||
kfree(buf);
|
||||
ksys_unlink("/dev/ram");
|
||||
init_unlink("/dev/ram");
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user