buffer: Don't test folio error in block_read_full_folio()

We can cache this information in a local variable instead of communicating
from one part of the function to another via folio flags.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

diff --git a/fs/buffer.c b/fs/buffer.c
index a0214e3f90d367a22ffb315eddff2197538eb35b..ce9844d7c10fac3b04bdfd3ca9e0242790014dcf 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2259,6 +2259,7 @@ int block_read_full_folio(struct folio *folio, get_block_t *get_block)
        unsigned int blocksize, bbits;
        int nr, i;
        int fully_mapped = 1;
+       bool page_error = false;
 
        VM_BUG_ON_FOLIO(folio_test_large(folio), folio);
 
@@ -2283,8 +2284,10 @@ int block_read_full_folio(struct folio *folio, get_block_t *get_block)
                        if (iblock < lblock) {
                                WARN_ON(bh->b_size != blocksize);
                                err = get_block(inode, iblock, bh, 0);
-                               if (err)
+                               if (err) {
                                        folio_set_error(folio);
+                                       page_error = true;
+                               }
                        }
                        if (!buffer_mapped(bh)) {
                                folio_zero_range(folio, i * blocksize,
@@ -2311,7 +2314,7 @@ int block_read_full_folio(struct folio *folio, get_block_t *get_block)
                 * All buffers are uptodate - we can set the folio uptodate
                 * as well. But not if get_block() returned an error.
                 */
-               if (!folio_test_error(folio))
+               if (!page_error)
                        folio_mark_uptodate(folio);
                folio_unlock(folio);
                return 0;