UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

buffer: use b_folio in end_buffer_async_read() 

Removes a call to compound_head() in SetPageError(), saving 76 bytes of
text.

Link: https://lkml.kernel.org/r/20221215214402.3522366-5-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-12-15 21:43:54 +00:00 committed by Andrew Morton
parent 03c5f33123
commit 2e2dba15d1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/buffer.c
View File

@ -246,18 +246,18 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
unsigned long flags; unsigned long flags;
struct buffer_head *first; struct buffer_head *first;
struct buffer_head *tmp; struct buffer_head *tmp;
struct page *page; struct folio *folio;
int page_uptodate = 1; int folio_uptodate = 1;
BUG_ON(!buffer_async_read(bh)); BUG_ON(!buffer_async_read(bh));
page = bh->b_page; folio = bh->b_folio;
if (uptodate) { if (uptodate) {
set_buffer_uptodate(bh); set_buffer_uptodate(bh);
} else { } else {
clear_buffer_uptodate(bh); clear_buffer_uptodate(bh);
buffer_io_error(bh, ", async page read"); buffer_io_error(bh, ", async page read");
SetPageError(page); folio_set_error(folio);
} }
/* /*
@ -265,14 +265,14 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
* two buffer heads end IO at almost the same time and both * two buffer heads end IO at almost the same time and both
* decide that the page is now completely done. * decide that the page is now completely done.
*/ */
first = page_buffers(page); first = folio_buffers(folio);
spin_lock_irqsave(&first->b_uptodate_lock, flags); spin_lock_irqsave(&first->b_uptodate_lock, flags);
clear_buffer_async_read(bh); clear_buffer_async_read(bh);
unlock_buffer(bh); unlock_buffer(bh);
tmp = bh; tmp = bh;
do { do {
if (!buffer_uptodate(tmp)) if (!buffer_uptodate(tmp))
page_uptodate = 0; folio_uptodate = 0;
if (buffer_async_read(tmp)) { if (buffer_async_read(tmp)) {
BUG_ON(!buffer_locked(tmp)); BUG_ON(!buffer_locked(tmp));
goto still_busy; goto still_busy;
@ -285,9 +285,9 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
* If all of the buffers are uptodate then we can set the page * If all of the buffers are uptodate then we can set the page
* uptodate. * uptodate.
*/ */
if (page_uptodate) if (folio_uptodate)
SetPageUptodate(page); folio_mark_uptodate(folio);
unlock_page(page); folio_unlock(folio);
return; return;
still_busy: still_busy: