From: Reuben Hawkins Date: Tue, 3 Oct 2023 01:57:04 +0000 (-0500) Subject: vfs: fix readahead(2) on block devices X-Git-Tag: v6.7-rc1~208^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7116c0af4b8414b2f19fdb366eea213cbd9d91c2;p=thirdparty%2Fkernel%2Flinux.git 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 Link: https://lore.kernel.org/r/20231003015704.2415-1-reubenhwk@gmail.com Reviewed-by: Amir Goldstein Signed-off-by: Christian Brauner --- diff --git a/mm/readahead.c b/mm/readahead.c index e815c114de21e..6925e6959fd3f 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);