Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3718a48e authored by Reuben Hawkins's avatar Reuben Hawkins Committed by Greg Kroah-Hartman
Browse files

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: 3d8f7615 ("vfs: implement readahead(2) using POSIX_FADV_WILLNEED")
Signed-off-by: default avatarReuben Hawkins <reubenhwk@gmail.com>
Link: https://lore.kernel.org/r/20231003015704.2415-1-reubenhwk@gmail.com


Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 87e8e7a7

mm/readahead.c

+2 −1
Original line number Diff line number Diff line
@@ -592,7 +592,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);