korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-23 20:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

orangefs: Remove test for folio error

Browse Source 
The page cache clears the error bit before calling ->read_folio(),
so this condition could never have been true.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-04-29 11:12:16 -04:00
parent ba9863127c
commit 9329883a1c
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/orangefs/inode.c
View File

@ -307,7 +307,7 @@ static int orangefs_read_folio(struct file *file, struct folio *folio)
ret = wait_for_direct_io(ORANGEFS_IO_READ, inode, &off, &iter, ret = wait_for_direct_io(ORANGEFS_IO_READ, inode, &off, &iter,
folio_size(folio), inode->i_size, NULL, NULL, file); folio_size(folio), inode->i_size, NULL, NULL, file);
/* this will only zero remaining unread portions of the page data */ /* this will only zero remaining unread portions of the folio data */
iov_iter_zero(~0U, &iter); iov_iter_zero(~0U, &iter);
/* takes care of potential aliasing */ /* takes care of potential aliasing */
flush_dcache_folio(folio); flush_dcache_folio(folio);
@ -315,8 +315,6 @@ static int orangefs_read_folio(struct file *file, struct folio *folio)
folio_set_error(folio); folio_set_error(folio);
} else { } else {
folio_mark_uptodate(folio); folio_mark_uptodate(folio);
if (folio_test_error(folio))
folio_clear_error(folio);
ret = 0; ret = 0;
} }
/* unlock the folio after the ->read_folio() routine completes */ /* unlock the folio after the ->read_folio() routine completes */