Commit 83ff98c3 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

init: add an init_mkdir helper 



Add a simple helper to mkdir with a kernel space file name and switch
the early init code over to it.  Remove the now unused ksys_mkdir.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent cd3acb6a

fs/init.c

+18 −0
Original line number Diff line number Diff line
@@ -176,6 +176,24 @@ int __init init_unlink(const char *pathname) 
	return do_unlinkat(AT_FDCWD, getname_kernel(pathname));

}



int __init init_mkdir(const char *pathname, umode_t mode)

{

	struct dentry *dentry;

	struct path path;

	int error;



	dentry = kern_path_create(AT_FDCWD, pathname, &path, LOOKUP_DIRECTORY);

	if (IS_ERR(dentry))

		return PTR_ERR(dentry);

	if (!IS_POSIXACL(path.dentry->d_inode))

		mode &= ~current_umask();

	error = security_path_mkdir(&path, dentry, mode);

	if (!error)

		error = vfs_mkdir(path.dentry->d_inode, dentry, mode);

	done_path_create(&path, dentry);

	return error;

}



int __init init_rmdir(const char *pathname)

{

	return do_rmdir(AT_FDCWD, getname_kernel(pathname));

fs/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, 
			   const char *, unsigned int, struct path *);

long do_mknodat(int dfd, const char __user *filename, umode_t mode,

		unsigned int dev);

long do_mkdirat(int dfd, const char __user *pathname, umode_t mode);

long do_rmdir(int dfd, struct filename *name);

long do_unlinkat(int dfd, struct filename *name);

int may_linkat(struct path *link);

fs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -3645,7 +3645,7 @@ int vfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 
}

EXPORT_SYMBOL(vfs_mkdir);



long do_mkdirat(int dfd, const char __user *pathname, umode_t mode)

static long do_mkdirat(int dfd, const char __user *pathname, umode_t mode)

{

	struct dentry *dentry;

	struct path path;

include/linux/init_syscalls.h

+1 −0
Original line number Diff line number Diff line
@@ -11,4 +11,5 @@ int __init init_eaccess(const char *filename); 
int __init init_link(const char *oldname, const char *newname);

int __init init_symlink(const char *oldname, const char *newname);

int __init init_unlink(const char *pathname);

int __init init_mkdir(const char *pathname, umode_t mode);

int __init init_rmdir(const char *pathname);

include/linux/syscalls.h

+0 −7
Original line number Diff line number Diff line
@@ -1270,13 +1270,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.

 */

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)

{

	return do_mkdirat(AT_FDCWD, pathname, mode);

}



extern long do_mknodat(int dfd, const char __user *filename, umode_t mode,

		       unsigned int dev);