diff options
author | Reuben Hawkins <[email protected]> | 2023-10-02 20:57:04 -0500 |
---|---|---|
committer | Christian Brauner <[email protected]> | 2023-10-19 11:02:49 +0200 |
commit | 7116c0af4b8414b2f19fdb366eea213cbd9d91c2 (patch) | |
tree | 2c6d5d09ef34e68892ded8bdc76b00f27403aaed | |
parent | 50d910d27362d6809a0668f0f1cb5220bc7dc6a0 (diff) |
vfs: fix readahead(2) on block devices
Readahead was factored to call generic_fadvise. That refactor added an
S_ISREG restriction which broke readahead on block devices.
In addition to S_ISREG, this change checks S_ISBLK to fix block device
readahead. There is no change in behavior with any file type besides block
devices in this change.
Fixes: 3d8f7615319b ("vfs: implement readahead(2) using POSIX_FADV_WILLNEED")
Signed-off-by: Reuben Hawkins <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Reviewed-by: Amir Goldstein <[email protected]>
Signed-off-by: Christian Brauner <[email protected]>
-rw-r--r-- | mm/readahead.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/readahead.c b/mm/readahead.c index e815c114de21..6925e6959fd3 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -735,7 +735,8 @@ ssize_t ksys_readahead(int fd, loff_t offset, size_t count) */ ret = -EINVAL; if (!f.file->f_mapping || !f.file->f_mapping->a_ops || - !S_ISREG(file_inode(f.file)->i_mode)) + (!S_ISREG(file_inode(f.file)->i_mode) && + !S_ISBLK(file_inode(f.file)->i_mode))) goto out; ret = vfs_fadvise(f.file, offset, count, POSIX_FADV_WILLNEED); |