From: Reuben Hawkins <reubenhwk@gmail.com>
To: amir73il@gmail.com
Cc: willy@infradead.org, chrubis@suse.cz, mszeredi@redhat.com,
brauner@kernel.org, lkp@intel.com, linux-fsdevel@vger.kernel.org,
oliver.sang@intel.com, viro@zeniv.linux.org.uk,
oe-lkp@lists.linux.dev, ltp@lists.linux.it,
Reuben Hawkins <reubenhwk@gmail.com>, Jan Kara <jack@suse.cz>
Subject: [PATCH v3] vfs: fix readahead(2) on block devices
Date: Sun, 24 Sep 2023 00:08:46 -0500 [thread overview]
Message-ID: <20230924050846.2263-1-reubenhwk@gmail.com> (raw)
Readahead was factored to call generic_fadvise. That refactor added an S_ISREG
restriction which broke readahead on block devices.
This change swaps out the existing restrictions with an FMODE_LSEEK check to
fix block device readahead.
The readahead01.c and readahead02.c tests pass in ltp/testcases/...
Fixes: 3d8f7615319b ("vfs: implement readahead(2) using POSIX_FADV_WILLNEED")
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Reuben Hawkins <reubenhwk@gmail.com>
---
mm/readahead.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/mm/readahead.c b/mm/readahead.c
index e815c114de21..0ff6fffe3c84 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -734,8 +734,7 @@ ssize_t ksys_readahead(int fd, loff_t offset, size_t count)
* on this file, then we must return -EINVAL.
*/
ret = -EINVAL;
- if (!f.file->f_mapping || !f.file->f_mapping->a_ops ||
- !S_ISREG(file_inode(f.file)->i_mode))
+ if (!(f.file->f_mode & FMODE_LSEEK))
goto out;
ret = vfs_fadvise(f.file, offset, count, POSIX_FADV_WILLNEED);
--
2.34.1
next reply other threads:[~2023-09-24 5:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-24 5:08 Reuben Hawkins [this message]
2023-09-24 7:11 ` [PATCH v3] vfs: fix readahead(2) on block devices Matthew Wilcox
2023-09-24 10:30 ` Christian Brauner
2023-09-24 14:35 ` Matthew Wilcox
2023-09-25 12:47 ` Christian Brauner
2023-09-25 8:32 ` Cyril Hrubis
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=20230924050846.2263-1-reubenhwk@gmail.com \
--to=reubenhwk@gmail.com \
--cc=amir73il@gmail.com \
--cc=brauner@kernel.org \
--cc=chrubis@suse.cz \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=lkp@intel.com \
--cc=ltp@lists.linux.it \
--cc=mszeredi@redhat.com \
--cc=oe-lkp@lists.linux.dev \
--cc=oliver.sang@intel.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).