buffer: use folio_end_read()

There are two places that we can use this new helper.

Link: https://lkml.kernel.org/r/20231004165317.1061855-6-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/buffer.c b/fs/buffer.c
index edec8652788c2ef2873ae6faf28868c50e0b277b..86ddfa52c6995fa467141aad2883fc8f2e2a47cd 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -282,13 +282,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
        } while (tmp != bh);
        spin_unlock_irqrestore(&first->b_uptodate_lock, flags);
 
-       /*
-        * If all of the buffers are uptodate then we can set the page
-        * uptodate.
-        */
-       if (folio_uptodate)
-               folio_mark_uptodate(folio);
-       folio_unlock(folio);
+       folio_end_read(folio, folio_uptodate);
        return;
 
 still_busy:
@@ -2433,12 +2427,10 @@ int block_read_full_folio(struct folio *folio, get_block_t *get_block)
 
        if (!nr) {
                /*
-                * All buffers are uptodate - we can set the folio uptodate
-                * as well. But not if get_block() returned an error.
+                * All buffers are uptodate or get_block() returned an
+                * error when trying to map them - we can finish the read.
                 */
-               if (!page_error)
-                       folio_mark_uptodate(folio);
-               folio_unlock(folio);
+               folio_end_read(folio, !page_error);
                return 0;
        }