From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk,
Jens Axboe <axboe@kernel.dk>,
linux-fsdevel@vger.kernel.org
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH 3/6] fs: clear FMODE_LSEEK if no llseek function
Date: Fri, 24 Jun 2022 18:56:28 +0200 [thread overview]
Message-ID: <20220624165631.2124632-4-Jason@zx2c4.com> (raw)
In-Reply-To: <20220624165631.2124632-1-Jason@zx2c4.com>
This helps unify a longstanding wart where FMODE_LSEEK hasn't been
uniformly unset when it should be.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
fs/file_table.c | 2 ++
fs/open.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/fs/file_table.c b/fs/file_table.c
index 5424e3a8df5f..15700b2e1b53 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -241,6 +241,8 @@ static struct file *alloc_file(const struct path *path, int flags,
if ((file->f_mode & FMODE_WRITE) &&
likely(fop->write || fop->write_iter))
file->f_mode |= FMODE_CAN_WRITE;
+ if ((file->f_mode & FMODE_LSEEK) && !file->f_op->llseek)
+ file->f_mode &= ~FMODE_LSEEK;
file->f_mode |= FMODE_OPENED;
file->f_op = fop;
if ((file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
diff --git a/fs/open.c b/fs/open.c
index 1d57fbde2feb..07c332753a36 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -858,6 +858,8 @@ static int do_dentry_open(struct file *f,
if ((f->f_mode & FMODE_WRITE) &&
likely(f->f_op->write || f->f_op->write_iter))
f->f_mode |= FMODE_CAN_WRITE;
+ if ((f->f_mode & FMODE_LSEEK) && !f->f_op->llseek)
+ f->f_mode &= ~FMODE_LSEEK;
if (f->f_mapping->a_ops && f->f_mapping->a_ops->direct_IO)
f->f_mode |= FMODE_CAN_ODIRECT;
--
2.35.1
next prev parent reply other threads:[~2022-06-24 16:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-24 16:56 [PATCH 0/6] cleanup llseek and splice Jason A. Donenfeld
2022-06-24 16:56 ` [PATCH 1/6] ksmbd: use vfs_llseek instead of dereferencing NULL Jason A. Donenfeld
2022-06-24 21:20 ` Al Viro
2022-06-25 4:10 ` Namjae Jeon
2022-06-24 16:56 ` [PATCH 2/6] fs: do not set no_llseek in fops Jason A. Donenfeld
2022-06-24 21:48 ` Al Viro
2022-06-25 10:46 ` Jason A. Donenfeld
2022-06-24 16:56 ` Jason A. Donenfeld [this message]
2022-06-24 17:04 ` [PATCH 3/6] fs: clear FMODE_LSEEK if no llseek function Al Viro
2022-06-24 17:09 ` Jason A. Donenfeld
2022-06-24 17:13 ` Al Viro
2022-06-24 17:17 ` Jason A. Donenfeld
2022-06-24 16:56 ` [PATCH 4/6] fs: check FMODE_LSEEK to control internal pipe splicing Jason A. Donenfeld
2022-06-24 16:56 ` [PATCH 5/6] dma-buf: remove useless FMODE_LSEEK flag Jason A. Donenfeld
2022-06-24 21:51 ` Al Viro
2022-06-24 16:56 ` [PATCH 6/6] vfio: do not set " Jason A. Donenfeld
2022-06-24 21:53 ` Al Viro
2022-06-25 10:52 ` Jason A. Donenfeld
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=20220624165631.2124632-4-Jason@zx2c4.com \
--to=jason@zx2c4.com \
--cc=axboe@kernel.dk \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®