Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: linux-kernel@vger.kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>, Song Liu <song@kernel.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 16/16] fs: remove ksys_open
Date: Mon, 15 Jun 2020 14:53:23 +0200 [thread overview]
Message-ID: <20200615125323.930983-17-hch@lst.de> (raw)
In-Reply-To: <20200615125323.930983-1-hch@lst.de>
Just open code it in the two callers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/open.c | 11 ++++++++---
include/linux/syscalls.h | 11 -----------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/fs/open.c b/fs/open.c
index 6348173532e663..4375a5a8e726ea 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -1193,7 +1193,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)
{
- 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,
@@ -1255,9 +1257,12 @@ COMPAT_SYSCALL_DEFINE4(openat, int, dfd, const char __user *, filename, int, fla
*/
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
/*
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index bde56097a7c27e..90910d6f4d51fe 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -1372,17 +1372,6 @@ static inline int ksys_close(unsigned int 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);
static inline long ksys_truncate(const char __user *pathname, loff_t length)
--
2.26.2
next prev parent reply other threads:[~2020-06-15 12:54 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 12:53 decruft the early init / initrd / initramfs code Christoph Hellwig
2020-06-15 12:53 ` [PATCH 01/16] init: remove the bstat helper Christoph Hellwig
2020-07-02 23:25 ` Song Liu
2020-07-07 10:34 ` Christoph Hellwig
2020-07-07 16:54 ` Song Liu
2020-07-08 6:38 ` Christoph Hellwig
2020-06-15 12:53 ` [PATCH 02/16] md: move the early init autodetect code to drivers/md/ Christoph Hellwig
2020-06-15 12:53 ` [PATCH 03/16] md: replace the RAID_AUTORUN ioctl with a direct function call Christoph Hellwig
2020-06-15 12:53 ` [PATCH 04/16] md: remove the autoscan partition re-read Christoph Hellwig
2020-06-15 12:53 ` [PATCH 05/16] md: remove the kernel version of md_u.h Christoph Hellwig
2020-06-15 12:53 ` [PATCH 06/16] md: simplify md_setup_drive Christoph Hellwig
2020-06-15 12:53 ` [PATCH 07/16] md: rewrite md_setup_drive to avoid ioctls Christoph Hellwig
2020-06-15 12:53 ` [PATCH 08/16] initrd: remove support for multiple floppies Christoph Hellwig
2020-06-15 12:53 ` [PATCH 09/16] initrd: remove the BLKFLSBUF call in handle_initrd Christoph Hellwig
2020-07-03 3:40 ` H. Peter Anvin
2020-07-04 0:18 ` antlists
2020-07-04 2:19 ` hpa
2020-07-07 9:03 ` Christoph Hellwig
2020-06-15 12:53 ` [PATCH 10/16] initrd: switch initrd loading to struct file based APIs Christoph Hellwig
2020-06-15 12:53 ` [PATCH 11/16] initrd: mark init_linuxrc as __init Christoph Hellwig
2020-06-15 12:53 ` [PATCH 12/16] initramfs: remove the populate_initrd_image and clean_rootfs stubs Christoph Hellwig
2020-06-15 12:53 ` [PATCH 13/16] initramfs: simplify clean_rootfs Christoph Hellwig
2020-06-15 12:53 ` [PATCH 14/16] initramfs: switch initramfs unpacking to struct file based APIs Christoph Hellwig
2020-06-15 12:53 ` [PATCH 15/16] init: open code setting up stdin/stdout/stderr Christoph Hellwig
2020-06-15 12:53 ` Christoph Hellwig [this message]
2020-06-15 16:03 ` decruft the early init / initrd / initramfs code Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200615125323.930983-17-hch@lst.de \
--to=hch@lst.de \
--cc=hpa@zytor.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=song@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--subject='Re: [PATCH 16/16] fs: remove ksys_open' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).