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>
This commit is contained in:
parent
ad9d98524e
commit
5364ca408f
1 changed files with 2 additions and 1 deletions
|
@ -637,7 +637,8 @@ ssize_t ksys_readahead(int fd, loff_t offset, size_t count)
|
||||||
*/
|
*/
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
if (!f.file->f_mapping || !f.file->f_mapping->a_ops ||
|
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;
|
goto out;
|
||||||
|
|
||||||
ret = vfs_fadvise(f.file, offset, count, POSIX_FADV_WILLNEED);
|
ret = vfs_fadvise(f.file, offset, count, POSIX_FADV_WILLNEED);
|
||||||
|
|
Loading…
Reference in a new issue