summaryrefslogtreecommitdiff
path: root/fs/orangefs
diff options
context:
space:
mode:
authorMatthew Wilcox (Oracle) <willy@infradead.org>2022-04-29 18:12:16 +0300
committerMatthew Wilcox (Oracle) <willy@infradead.org>2022-06-29 15:51:07 +0300
commit9329883a1c9b200bfe7f3c9e5338c407a690e39b (patch)
tree63956cfff9b18956ef692b6c54e4f7f770ecaea4 /fs/orangefs
parentba9863127cdf9e438f277e15533bb9ebff87897d (diff)
downloadlinux-9329883a1c9b200bfe7f3c9e5338c407a690e39b.tar.xz
orangefs: Remove test for folio error
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>
Diffstat (limited to 'fs/orangefs')
-rw-r--r--fs/orangefs/inode.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 5ce27dde3c79..7a8c0c6e698d 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -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,
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);
/* takes care of potential aliasing */
flush_dcache_folio(folio);
@@ -315,8 +315,6 @@ static int orangefs_read_folio(struct file *file, struct folio *folio)
folio_set_error(folio);
} else {
folio_mark_uptodate(folio);
- if (folio_test_error(folio))
- folio_clear_error(folio);
ret = 0;
}
/* unlock the folio after the ->read_folio() routine completes */