xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs: remove ksys_open

Browse Source 
Just open code it in the two callers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Hellwig
2020-06-06 15:03:21 +02:00
parent fb2da16cd7
commit 166e07c37c
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/open.c
View File

@@ -1208,7 +1208,9 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
SYSCALL_DEFINE3(open, const char __user *, filename, int, flags, umode_t, mode) SYSCALL_DEFINE3(open, const char __user *, filename, int, flags, umode_t, mode)
{ {
return ksys_open(filename, flags, mode); if (force_o_largefile())
flags |= O_LARGEFILE;
return do_sys_open(AT_FDCWD, filename, flags, mode);
} }
SYSCALL_DEFINE4(openat, int, dfd, const char __user *, filename, int, flags, SYSCALL_DEFINE4(openat, int, dfd, const char __user *, filename, int, flags,
@@ -1270,9 +1272,12 @@ COMPAT_SYSCALL_DEFINE4(openat, int, dfd, const char __user *, filename, int, fla
*/ */
SYSCALL_DEFINE2(creat, const char __user *, pathname, umode_t, mode) SYSCALL_DEFINE2(creat, const char __user *, pathname, umode_t, mode)
{ {
return ksys_open(pathname, O_CREAT | O_WRONLY | O_TRUNC, mode); int flags = O_CREAT | O_WRONLY | O_TRUNC;
}
if (force_o_largefile())
flags |= O_LARGEFILE;
return do_sys_open(AT_FDCWD, pathname, flags, mode);
}
#endif #endif
/* /*

11
include/linux/syscalls.h
View File

@@ -1374,17 +1374,6 @@ static inline int ksys_close(unsigned int fd)
return __close_fd(current->files, fd); return __close_fd(current->files, fd);
} }
extern long do_sys_open(int dfd, const char __user *filename, int flags,
umode_t mode);
static inline long ksys_open(const char __user *filename, int flags,
umode_t mode)
{
if (force_o_largefile())
flags |= O_LARGEFILE;
return do_sys_open(AT_FDCWD, filename, flags, mode);
}
extern long do_sys_truncate(const char __user *pathname, loff_t length); extern long do_sys_truncate(const char __user *pathname, loff_t length);
static inline long ksys_truncate(const char __user *pathname, loff_t length) static inline long ksys_truncate(const char __user *pathname, loff_t length)