tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Matthew Wilcox (Oracle) and committed by
Andrew Morton 6ba924d3 f8174a11

+4 -12
+4 -12
fs/buffer.c
··· 282 282 } while (tmp != bh); 283 283 spin_unlock_irqrestore(&first->b_uptodate_lock, flags); 284 284 285 - /* 286 - * If all of the buffers are uptodate then we can set the page 287 - * uptodate. 288 - */ 289 - if (folio_uptodate) 290 - folio_mark_uptodate(folio); 291 - folio_unlock(folio); 285 + folio_end_read(folio, folio_uptodate); 292 286 return; 293 287 294 288 still_busy: ··· 2427 2433 2428 2434 if (!nr) { 2429 2435 /* 2430 - * All buffers are uptodate - we can set the folio uptodate 2431 - * as well. But not if get_block() returned an error. 2436 + * All buffers are uptodate or get_block() returned an 2437 + * error when trying to map them - we can finish the read. 2432 2438 */ 2433 - if (!page_error) 2434 - folio_mark_uptodate(folio); 2435 - folio_unlock(folio); 2439 + folio_end_read(folio, !page_error); 2436 2440 return 0; 2437 2441 } 2438 2442