VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2020-08-07 09:40:34 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2020-08-07 09:40:34 -0700 commit: e1ec517e18acc0aa9795ff92c15f0adabcb12db9 parent: 19b39c38abf68591edbd698740d410c37ee075cc

Commit Summary:

Merge branch 'hch.init_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Diffstat:

1 file changed, 1 insertion, 6 deletions

diff --git a/fs/file.c b/fs/file.c
index 4cb9ef4d8571..21c0893f2f1d 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -1145,7 +1145,7 @@ SYSCALL_DEFINE2(dup2, unsigned int, oldfd, unsigned int, newfd)
 	return ksys_dup3(oldfd, newfd, 0);
 }
 
-int ksys_dup(unsigned int fildes)
+SYSCALL_DEFINE1(dup, unsigned int, fildes)
 {
 	int ret = -EBADF;
 	struct file *file = fget_raw(fildes);
@@ -1160,11 +1160,6 @@ int ksys_dup(unsigned int fildes)
 	return ret;
 }
 
-SYSCALL_DEFINE1(dup, unsigned int, fildes)
-{
-	return ksys_dup(fildes);
-}
-
 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
 {
 	int err;