Commit cd3acb6a authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

init: add an init_symlink helper 



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

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

fs/init.c

+16 −0
Original line number Diff line number Diff line
@@ -155,6 +155,22 @@ int __init init_link(const char *oldname, const char *newname) 
	return error;

}



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

{

	struct dentry *dentry;

	struct path path;

	int error;



	dentry = kern_path_create(AT_FDCWD, newname, &path, 0);

	if (IS_ERR(dentry))

		return PTR_ERR(dentry);

	error = security_path_symlink(&path, dentry, oldname);

	if (!error)

		error = vfs_symlink(path.dentry->d_inode, dentry, oldname);

	done_path_create(&path, dentry);

	return error;

}



int __init init_unlink(const char *pathname)

{

	return do_unlinkat(AT_FDCWD, getname_kernel(pathname));

fs/internal.h

+0 −2
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ long do_mknodat(int dfd, const char __user *filename, umode_t mode, 
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);

long do_symlinkat(const char __user *oldname, int newdfd,

		  const char __user *newname);

int may_linkat(struct path *link);



/*

fs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -3955,7 +3955,7 @@ int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname) 
}

EXPORT_SYMBOL(vfs_symlink);



long do_symlinkat(const char __user *oldname, int newdfd,

static long do_symlinkat(const char __user *oldname, int newdfd,

		  const char __user *newname)

{

	int error;

include/linux/init_syscalls.h

+1 −0
Original line number Diff line number Diff line
@@ -9,5 +9,6 @@ int __init init_chown(const char *filename, uid_t user, gid_t group, int flags); 
int __init init_chmod(const char *filename, umode_t mode);

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_rmdir(const char *pathname);

include/linux/syscalls.h

+0 −9
Original line number Diff line number Diff line
@@ -1277,15 +1277,6 @@ static inline long ksys_mkdir(const char __user *pathname, umode_t mode) 
	return do_mkdirat(AT_FDCWD, pathname, mode);

}



extern long do_symlinkat(const char __user *oldname, int newdfd,

			 const char __user *newname);



static inline long ksys_symlink(const char __user *oldname,

				const char __user *newname)

{

	return do_symlinkat(oldname, AT_FDCWD, newname);

}



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

		       unsigned int dev);