Browse Source

fs: add do_renameat2() helper; remove internal call to sys_renameat2()

Using this helper removes in-kernel calls to the sys_renameat2() syscall.

This patch is part of a series which removes in-kernel calls to syscalls.
On this basis, the syscall entry path can be streamlined. For details, see
http://lkml.kernel.org/r/20180325162527.GA17492@light.dominikbrodowski.net

Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Dominik Brodowski 7 years ago
parent
commit
ee81feb64e
1 changed files with 10 additions and 4 deletions
  1. 10 4
      fs/namei.c

+ 10 - 4
fs/namei.c

@@ -4478,8 +4478,8 @@ out:
 }
 }
 EXPORT_SYMBOL(vfs_rename);
 EXPORT_SYMBOL(vfs_rename);
 
 
-SYSCALL_DEFINE5(renameat2, int, olddfd, const char __user *, oldname,
-		int, newdfd, const char __user *, newname, unsigned int, flags)
+static int do_renameat2(int olddfd, const char __user *oldname, int newdfd,
+			const char __user *newname, unsigned int flags)
 {
 {
 	struct dentry *old_dentry, *new_dentry;
 	struct dentry *old_dentry, *new_dentry;
 	struct dentry *trap;
 	struct dentry *trap;
@@ -4621,15 +4621,21 @@ exit:
 	return error;
 	return error;
 }
 }
 
 
+SYSCALL_DEFINE5(renameat2, int, olddfd, const char __user *, oldname,
+		int, newdfd, const char __user *, newname, unsigned int, flags)
+{
+	return do_renameat2(olddfd, oldname, newdfd, newname, flags);
+}
+
 SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
 SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
 		int, newdfd, const char __user *, newname)
 		int, newdfd, const char __user *, newname)
 {
 {
-	return sys_renameat2(olddfd, oldname, newdfd, newname, 0);
+	return do_renameat2(olddfd, oldname, newdfd, newname, 0);
 }
 }
 
 
 SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newname)
 SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newname)
 {
 {
-	return sys_renameat2(AT_FDCWD, oldname, AT_FDCWD, newname, 0);
+	return do_renameat2(AT_FDCWD, oldname, AT_FDCWD, newname, 0);
 }
 }
 
 
 int vfs_whiteout(struct inode *dir, struct dentry *dentry)
 int vfs_whiteout(struct inode *dir, struct dentry *dentry)