diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-07-22 11:11:45 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-07-31 08:17:52 +0200 |
| commit | 20cce026c3e0972017b9cb4a7cccfb8cacf187d5 (patch) | |
| tree | d3e48d9708b1864d9c4dc8addefd3340699120e8 | |
| parent | init: add an init_unlink helper (diff) | |
| download | linux-20cce026c3e0972017b9cb4a7cccfb8cacf187d5.tar.xz linux-20cce026c3e0972017b9cb4a7cccfb8cacf187d5.zip | |
init: add an init_rmdir helper
Add a simple helper to rmdir with a kernel space file name and switch
the early init code over to it. Remove the now unused ksys_rmdir.
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | fs/init.c | 5 | ||||
| -rw-r--r-- | include/linux/init_syscalls.h | 1 | ||||
| -rw-r--r-- | include/linux/syscalls.h | 7 | ||||
| -rw-r--r-- | init/initramfs.c | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/fs/init.c b/fs/init.c index 507ffbb5d146..eabd9ed2b510 100644 --- a/fs/init.c +++ b/fs/init.c @@ -42,3 +42,8 @@ int __init init_unlink(const char *pathname) { return do_unlinkat(AT_FDCWD, getname_kernel(pathname)); } + +int __init init_rmdir(const char *pathname) +{ + return do_rmdir(AT_FDCWD, getname_kernel(pathname)); +} diff --git a/include/linux/init_syscalls.h b/include/linux/init_syscalls.h index 00d597249549..abf3af563c0b 100644 --- a/include/linux/init_syscalls.h +++ b/include/linux/init_syscalls.h @@ -4,3 +4,4 @@ int __init init_mount(const char *dev_name, const char *dir_name, const char *type_page, unsigned long flags, void *data_page); int __init init_umount(const char *name, int flags); int __init init_unlink(const char *pathname); +int __init init_rmdir(const char *pathname); diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 26f9738e5ab8..a7b14258d245 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -1273,13 +1273,6 @@ int compat_ksys_ipc(u32 call, int first, int second, * The following kernel syscall equivalents are just wrappers to fs-internal * functions. Therefore, provide stubs to be inlined at the callsites. */ -long do_rmdir(int dfd, struct filename *name); - -static inline long ksys_rmdir(const char __user *pathname) -{ - return do_rmdir(AT_FDCWD, getname(pathname)); -} - extern long do_mkdirat(int dfd, const char __user *pathname, umode_t mode); static inline long ksys_mkdir(const char __user *pathname, umode_t mode) diff --git a/init/initramfs.c b/init/initramfs.c index eb58cee6dadb..1a9159bf452f 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -300,7 +300,7 @@ static void __init clean_path(char *path, umode_t fmode) if (!vfs_lstat(path, &st) && (st.mode ^ fmode) & S_IFMT) { if (S_ISDIR(st.mode)) - ksys_rmdir(path); + init_rmdir(path); else init_unlink(path); } |