vfs: fix readahead(2) on block devices
Subsystems (3)
PATCH v2 1/1 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.
This change removes the S_ISREG restriction to fix block device readahead. The change also means that readahead will return -ESPIPE on FIFO files instead of -EINVAL.
--- mm/readahead.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
mm/readahead.c +1 -2
@@ -734,8 +734,7 @@ ssize_t ksys_readahead(int fd, loff_t offset, size_t count)* on this file, then we must return -EINVAL. */ ret = -EINVAL ; -if (!f.file->f_mapping || !f.file->f_mapping->a_ops || - !S_ISREG (file_inode (f.file)->i_mode)) +if (!f.file->f_mapping || !f.file->f_mapping->a_ops) goto out; ret =vfs_fadvise (f.file, offset, count,POSIX_FADV_WILLNEED );
Signature · 1 line
2.34.1
Quoted 8 lines · Reuben Hawkins
Readahead was factored to call
generic_fadvise. That refactor added anS_ISREGrestriction which broke readahead on block devices.This change removes the
S_ISREGrestriction to fix block device readahead. The change also means that readahead will return-ESPIPEon FIFO files instead of-EINVAL.[...]
Applied to the vfs.misc branch of the vfs/vfs.git tree. Patches in the vfs.misc branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs.misc
[1/1] vfs: fix readahead(2) on block devices
https://git.kernel.org/vfs/vfs/c/d05ad99006a6
Quoted 11 lines · Reuben Hawkins
Readahead was factored to call
generic_fadvise. That refactor added anS_ISREGrestriction which broke readahead on block devices.This change removes the
S_ISREGrestriction to fix block device readahead. The change also means that readahead will return-ESPIPEon FIFO files instead of-EINVAL.Fixes 3d8f7615319b ("vfs: implement readahead(2) using POSIX_FADV_WILLNEED")Signed-off-by Reuben Hawkins <[email protected]>---
Christian,
I suggest adding the link to the original bug report on commit:
Thanks,
Amir.
Quoted 20 lines
mm/readahead.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)mm/readahead.c +1
-3@@ -734,8 +734,7 @@ ssize_t ksys_readahead(int fd, loff_t offset, size_t count)* on this file, then we must return -EINVAL. */ ret = -EINVAL ; -if (!f.file->f_mapping || !f.file->f_mapping->a_ops || - !S_ISREG (file_inode (f.file)->i_mode)) +if (!f.file->f_mapping || !f.file->f_mapping->a_ops) goto out; ret =vfs_fadvise (f.file, offset, count,POSIX_FADV_WILLNEED ); --2.34.1
Quoted 9 lines · Reuben Hawkins
Readahead was factored to call
generic_fadvise. That refactor added anS_ISREGrestriction which broke readahead on block devices.This change removes the
S_ISREGrestriction to fix block device readahead. The change also means that readahead will return-ESPIPEon FIFO files instead of-EINVAL.Fixes 3d8f7615319b ("vfs: implement readahead(2) using POSIX_FADV_WILLNEED")Signed-off-by Reuben Hawkins <[email protected]>
Nice catch! Feel free to add:
Honza
Quoted 21 lines
--- mm/readahead.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)mm/readahead.c +1
-2@@ -734,8 +734,7 @@ ssize_t ksys_readahead(int fd, loff_t offset, size_t count)* on this file, then we must return -EINVAL. */ ret = -EINVAL ; -if (!f.file->f_mapping || !f.file->f_mapping->a_ops || - !S_ISREG (file_inode (f.file)->i_mode)) +if (!f.file->f_mapping || !f.file->f_mapping->a_ops) goto out; ret =vfs_fadvise (f.file, offset, count,POSIX_FADV_WILLNEED );Signature · 1 line
2.34.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR