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 v2 3/8] fs: clear or set FMODE_LSEEK based on llseek function
Date: Sat, 25 Jun 2022 13:01:10 +0200 [thread overview]
Message-ID: <20220625110115.39956-4-Jason@zx2c4.com> (raw)
In-Reply-To: <20220625110115.39956-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..933686f84bf8 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -243,6 +243,8 @@ static struct file *alloc_file(const struct path *path, int flags,
file->f_mode |= FMODE_CAN_WRITE;
file->f_mode |= FMODE_OPENED;
file->f_op = fop;
+ if (file->f_op->llseek)
+ file->f_mode |= FMODE_LSEEK;
if ((file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ)
i_readcount_inc(path->dentry->d_inode);
return file;
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-25 11:01 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-25 11:01 [PATCH v2 0/8] cleanup llseek and splice Jason A. Donenfeld
2022-06-25 11:01 ` [PATCH v2 1/8] ksmbd: use vfs_llseek instead of dereferencing NULL Jason A. Donenfeld
2022-06-25 22:15 ` Jason A. Donenfeld
2022-06-26 0:54 ` Steve French
2022-06-25 11:01 ` [PATCH v2 2/8] fs: do not set no_llseek in fops Jason A. Donenfeld
2022-06-25 11:01 ` Jason A. Donenfeld [this message]
2022-06-25 13:07 ` [PATCH v2 3/8] fs: clear or set FMODE_LSEEK based on llseek function Christoph Hellwig
2022-06-25 13:29 ` Al Viro
2022-06-25 13:39 ` Christoph Hellwig
2022-06-25 14:11 ` Al Viro
2022-06-25 11:01 ` [PATCH v2 4/8] fs: check FMODE_LSEEK to control internal pipe splicing Jason A. Donenfeld
2022-06-25 11:01 ` [PATCH v2 5/8] fs: do not compare against ->llseek Jason A. Donenfeld
2022-06-25 11:01 ` [PATCH v2 6/8] fs: remove no_llseek Jason A. Donenfeld
2022-06-25 13:10 ` Christoph Hellwig
2022-06-25 21:53 ` Jason A. Donenfeld
2022-06-25 11:01 ` [PATCH v2 7/8] dma-buf: remove useless FMODE_LSEEK flag Jason A. Donenfeld
2022-06-25 11:01 ` Jason A. Donenfeld
2022-06-27 9:08 ` Daniel Vetter
2022-06-27 9:08 ` Daniel Vetter
2022-06-27 9:38 ` Jason A. Donenfeld
2022-06-29 10:30 ` Sumit Semwal
2022-06-25 11:01 ` [PATCH v2 8/8] vfio: do not set " Jason A. Donenfeld
2022-06-27 20:07 ` Alex Williamson
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=20220625110115.39956-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.