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>

diff --git a/fs/init.c b/fs/init.c
index 507ffbb5d146d6e27e2cdc3d8de4cbbf7f0bc95a..eabd9ed2b51092cdaf54dca72946d9df1ea132d8 100644 (file)
--- 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 00d597249549ee43186e2544ff5858bbb361e727..abf3af563c0b3aff1d1d46eb3c514846d1a3f2ee 100644 (file)
--- 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 26f9738e5ab8613d0deec2f8fb039d13be9d1680..a7b14258d245e245664cb4810cf0816ed2f2dbd8 100644 (file)
--- 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 eb58cee6dadb433bdf4c4361b4dbe6ae9a633d5c..1a9159bf452fecef5c96832ad13b384b61e48fe7 100644 (file)
--- 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);
        }