All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
	linux-fsdevel@vger.kernel.org
Subject: [PATCH 04/12] buffer: Use b_folio in end_buffer_async_read()
Date: Thu, 15 Dec 2022 21:43:54 +0000	[thread overview]
Message-ID: <20221215214402.3522366-5-willy@infradead.org> (raw)
In-Reply-To: <20221215214402.3522366-1-willy@infradead.org>

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

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 fs/buffer.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/fs/buffer.c b/fs/buffer.c
index 8a02fdaeec9a..5bdcc040eca3 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -246,18 +246,18 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
 	unsigned long flags;
 	struct buffer_head *first;
 	struct buffer_head *tmp;
-	struct page *page;
-	int page_uptodate = 1;
+	struct folio *folio;
+	int folio_uptodate = 1;
 
 	BUG_ON(!buffer_async_read(bh));
 
-	page = bh->b_page;
+	folio = bh->b_folio;
 	if (uptodate) {
 		set_buffer_uptodate(bh);
 	} else {
 		clear_buffer_uptodate(bh);
 		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
 	 * decide that the page is now completely done.
 	 */
-	first = page_buffers(page);
+	first = folio_buffers(folio);
 	spin_lock_irqsave(&first->b_uptodate_lock, flags);
 	clear_buffer_async_read(bh);
 	unlock_buffer(bh);
 	tmp = bh;
 	do {
 		if (!buffer_uptodate(tmp))
-			page_uptodate = 0;
+			folio_uptodate = 0;
 		if (buffer_async_read(tmp)) {
 			BUG_ON(!buffer_locked(tmp));
 			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
 	 * uptodate.
 	 */
-	if (page_uptodate)
-		SetPageUptodate(page);
-	unlock_page(page);
+	if (folio_uptodate)
+		folio_mark_uptodate(folio);
+	folio_unlock(folio);
 	return;
 
 still_busy:
-- 
2.35.1


  parent reply	other threads:[~2022-12-15 21:44 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-15 21:43 [PATCH 00/12] Start converting buffer_heads to use folios Matthew Wilcox (Oracle)
2022-12-15 21:43 ` [PATCH 01/12] buffer: Add b_folio as an alias of b_page Matthew Wilcox (Oracle)
2022-12-15 21:43 ` [PATCH 02/12] buffer: Replace obvious uses of b_page with b_folio Matthew Wilcox (Oracle)
2022-12-15 21:43 ` [PATCH 03/12] buffer: Use b_folio in touch_buffer() Matthew Wilcox (Oracle)
2022-12-15 21:43 ` Matthew Wilcox (Oracle) [this message]
2022-12-15 21:43 ` [PATCH 05/12] buffer: Use b_folio in end_buffer_async_write() Matthew Wilcox (Oracle)
2022-12-15 21:43 ` [PATCH 06/12] page_io: Remove buffer_head include Matthew Wilcox (Oracle)
2022-12-15 21:43 ` [PATCH 07/12] buffer: Use b_folio in mark_buffer_dirty() Matthew Wilcox (Oracle)
2022-12-15 21:43 ` [PATCH 08/12] gfs2: Replace obvious uses of b_page with b_folio Matthew Wilcox (Oracle)
2022-12-15 21:43 ` [PATCH 09/12] jbd2: " Matthew Wilcox (Oracle)
2022-12-15 21:44 ` [PATCH 10/12] nilfs2: " Matthew Wilcox (Oracle)
2022-12-15 21:44 ` [PATCH 11/12] reiserfs: " Matthew Wilcox (Oracle)
2022-12-15 21:44 ` [PATCH 12/12] mpage: Use b_folio in do_mpage_readpage() Matthew Wilcox (Oracle)
2023-01-12 12:01 ` [PATCH 00/12] Start converting buffer_heads to use folios Jan Kara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221215214402.3522366-5-willy@infradead.org \
    --to=willy@infradead.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-fsdevel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.