From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: Nikolay Borisov <n.borisov.lkml@gmail.com>
Cc: linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk
Subject: Re: [PATCH v3 5/7] fs: remove no_llseek
Date: Thu, 30 Jun 2022 15:50:41 +0200 [thread overview]
Message-ID: <Yr2qMekERjBU58DZ@zx2c4.com> (raw)
In-Reply-To: <feb7d93c-76bc-a7fc-0714-ed71495a16b9@gmail.com>
Hi Nikolay,
On Thu, Jun 30, 2022 at 09:45:04AM +0300, Nikolay Borisov wrote:
>
>
> On 29.06.22 г. 16:07 ч., Jason A. Donenfeld wrote:
> > Now that all callers of ->llseek are going through vfs_llseek(), we
> > don't gain anything by keeping no_llseek around. Nothing compares it or
> > calls it.
> >
> > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> > ---
> > fs/read_write.c | 17 +++--------------
> > include/linux/fs.h | 1 -
> > 2 files changed, 3 insertions(+), 15 deletions(-)
> >
> > diff --git a/fs/read_write.c b/fs/read_write.c
> > index b1b1cdfee9d3..69cd8d72d91e 100644
> > --- a/fs/read_write.c
> > +++ b/fs/read_write.c
> > @@ -227,12 +227,6 @@ loff_t noop_llseek(struct file *file, loff_t offset, int whence)
> > }
> > EXPORT_SYMBOL(noop_llseek);
> >
> > -loff_t no_llseek(struct file *file, loff_t offset, int whence)
> > -{
> > - return -ESPIPE;
> > -}
> > -EXPORT_SYMBOL(no_llseek);
> > -
> > loff_t default_llseek(struct file *file, loff_t offset, int whence)
> > {
> > struct inode *inode = file_inode(file);
> > @@ -290,14 +284,9 @@ EXPORT_SYMBOL(default_llseek);
> >
> > loff_t vfs_llseek(struct file *file, loff_t offset, int whence)
> > {
> > - loff_t (*fn)(struct file *, loff_t, int);
> > -
> > - fn = no_llseek;
> > - if (file->f_mode & FMODE_LSEEK) {
> > - if (file->f_op->llseek)
> > - fn = file->f_op->llseek;
> > - }
> > - return fn(file, offset, whence);
> > + if (!(file->f_mode & FMODE_LSEEK) || !file->f_op->llseek)
>
> Is it not sufficient here to just check for the presence of FMODE_LSEEK?
> NULL llseek shall result in FMODE_LSEEK not being set when the file is
> opened?
Yes, that's probably fine. I did this out of an abundance of caution,
but I have a feeling Al might agree with you that useless is useless. I
can send a v4 changing that.
Al, what do you think?
Jason
next prev parent reply other threads:[~2022-06-30 13:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-29 13:06 [PATCH v3 0/7] cleanup llseek and splice Jason A. Donenfeld
2022-06-29 13:06 ` [PATCH v3 1/7] fs: do not set no_llseek in fops Jason A. Donenfeld
2022-06-29 13:06 ` [PATCH v3 2/7] fs: clear or set FMODE_LSEEK based on llseek function Jason A. Donenfeld
2022-06-29 13:06 ` [PATCH v3 3/7] fs: check FMODE_LSEEK to control internal pipe splicing Jason A. Donenfeld
2022-06-29 13:06 ` [PATCH v3 4/7] fs: do not compare against ->llseek Jason A. Donenfeld
2022-06-29 13:07 ` [PATCH v3 5/7] fs: remove no_llseek Jason A. Donenfeld
2022-06-30 6:45 ` Nikolay Borisov
2022-06-30 13:50 ` Jason A. Donenfeld [this message]
2022-06-29 13:07 ` [PATCH v3 6/7] dma-buf: remove useless FMODE_LSEEK flag Jason A. Donenfeld
2022-06-29 13:07 ` [PATCH v3 7/7] vfio: do not set " 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=Yr2qMekERjBU58DZ@zx2c4.com \
--to=jason@zx2c4.com \
--cc=linux-kernel@vger.kernel.org \
--cc=n.borisov.lkml@gmail.com \
--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®