orangefs: Remove test for folio error
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Fri, 29 Apr 2022 15:12:16 +0000 (11:12 -0400)
committerMatthew Wilcox (Oracle) <willy@infradead.org>
Wed, 29 Jun 2022 12:51:07 +0000 (08:51 -0400)
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>
fs/orangefs/inode.c

index 5ce27dd..7a8c0c6 100644 (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,
                        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 */