diff options
| author | Reuben Hawkins <reubenhwk@gmail.com> | 2023-10-02 20:57:04 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-20 11:51:50 +0100 |
| commit | bc8e02850a59ddba791597181c040ecc4b341fdf (patch) | |
| tree | 5697f1edec5e2f332fa48f7f69255445afd75654 /mm | |
| parent | 8620933c3c53e128b9d4982de9a8808142654106 (diff) | |
| download | linux-stable-bc8e02850a59ddba791597181c040ecc4b341fdf.tar.gz linux-stable-bc8e02850a59ddba791597181c040ecc4b341fdf.tar.bz2 linux-stable-bc8e02850a59ddba791597181c040ecc4b341fdf.zip | |
vfs: fix readahead(2) on block devices
[ Upstream commit 7116c0af4b8414b2f19fdb366eea213cbd9d91c2 ]
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 <reubenhwk@gmail.com>
Link: https://lore.kernel.org/r/20231003015704.2415-1-reubenhwk@gmail.com
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'mm')
| -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 b10f0cf81d80..ba43428043a3 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -749,7 +749,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); |