From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
cluster-devel@redhat.com, Hannes Reinecke <hare@suse.com>,
Luis Chamberlain <mcgrof@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Andreas Gruenbacher <agruenba@redhat.com>,
Bob Peterson <rpeterso@redhat.com>
Subject: [PATCH v3 02/14] gfs2: Pass a folio to __gfs2_jdata_write_folio()
Date: Mon, 12 Jun 2023 22:01:29 +0100 [thread overview]
Message-ID: <20230612210141.730128-3-willy@infradead.org> (raw)
In-Reply-To: <20230612210141.730128-1-willy@infradead.org>
Remove a couple of folio->page conversions in the callers, and two
calls to compound_head() in the function itself. Rename it from
__gfs2_jdata_writepage() to __gfs2_jdata_write_folio().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: Bob Peterson <rpeterso@redhat.com>
Reviewed-by: Bob Peterson <rpeterso@redhat.com>
---
fs/gfs2/aops.c | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index 0518861df783..749135252d52 100644
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -113,30 +113,31 @@ static int gfs2_write_jdata_page(struct page *page,
}
/**
- * __gfs2_jdata_writepage - The core of jdata writepage
- * @page: The page to write
+ * __gfs2_jdata_write_folio - The core of jdata writepage
+ * @folio: The folio to write
* @wbc: The writeback control
*
* This is shared between writepage and writepages and implements the
* core of the writepage operation. If a transaction is required then
- * PageChecked will have been set and the transaction will have
+ * the checked flag will have been set and the transaction will have
* already been started before this is called.
*/
-
-static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *wbc)
+static int __gfs2_jdata_write_folio(struct folio *folio,
+ struct writeback_control *wbc)
{
- struct inode *inode = page->mapping->host;
+ struct inode *inode = folio->mapping->host;
struct gfs2_inode *ip = GFS2_I(inode);
- if (PageChecked(page)) {
- ClearPageChecked(page);
- if (!page_has_buffers(page)) {
- create_empty_buffers(page, inode->i_sb->s_blocksize,
- BIT(BH_Dirty)|BIT(BH_Uptodate));
+ if (folio_test_checked(folio)) {
+ folio_clear_checked(folio);
+ if (!folio_buffers(folio)) {
+ folio_create_empty_buffers(folio,
+ inode->i_sb->s_blocksize,
+ BIT(BH_Dirty)|BIT(BH_Uptodate));
}
- gfs2_trans_add_databufs(ip, page_folio(page), 0, PAGE_SIZE);
+ gfs2_trans_add_databufs(ip, folio, 0, folio_size(folio));
}
- return gfs2_write_jdata_page(page, wbc);
+ return gfs2_write_jdata_page(&folio->page, wbc);
}
/**
@@ -159,7 +160,7 @@ static int gfs2_jdata_writepage(struct page *page, struct writeback_control *wbc
goto out;
if (folio_test_checked(folio) || current->journal_info)
goto out_ignore;
- return __gfs2_jdata_writepage(&folio->page, wbc);
+ return __gfs2_jdata_write_folio(folio, wbc);
out_ignore:
folio_redirty_for_writepage(wbc, folio);
@@ -256,7 +257,7 @@ static int gfs2_write_jdata_batch(struct address_space *mapping,
trace_wbc_writepage(wbc, inode_to_bdi(inode));
- ret = __gfs2_jdata_writepage(&folio->page, wbc);
+ ret = __gfs2_jdata_write_folio(folio, wbc);
if (unlikely(ret)) {
if (ret == AOP_WRITEPAGE_ACTIVATE) {
folio_unlock(folio);
--
2.39.2
next prev parent reply other threads:[~2023-06-12 21:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-12 21:01 [PATCH v3 00/14] gfs2/buffer folio changes for 6.5 Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 01/14] gfs2: Use a folio inside gfs2_jdata_writepage() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` Matthew Wilcox (Oracle) [this message]
2023-06-12 21:01 ` [PATCH v3 03/14] gfs2: Convert gfs2_write_jdata_page() to gfs2_write_jdata_folio() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 04/14] buffer: Convert __block_write_full_page() to __block_write_full_folio() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 05/14] gfs2: Support ludicrously large folios in gfs2_trans_add_databufs() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 06/14] buffer: Make block_write_full_page() handle large folios correctly Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 07/14] buffer: Convert block_page_mkwrite() to use a folio Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 08/14] buffer: Convert __block_commit_write() to take " Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 09/14] buffer: Convert page_zero_new_buffers() to folio_zero_new_buffers() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 10/14] buffer: Convert grow_dev_page() to use a folio Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 11/14] buffer: Convert init_page_buffers() to folio_init_buffers() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 12/14] buffer: Convert link_dev_buffers to take a folio Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 13/14] buffer: Use a folio in __find_get_block_slow() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 14/14] buffer: Convert block_truncate_page() to use a folio Matthew Wilcox (Oracle)
2023-06-12 21:28 ` [PATCH v3 00/14] gfs2/buffer folio changes for 6.5 Andreas Gruenbacher
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=20230612210141.730128-3-willy@infradead.org \
--to=willy@infradead.org \
--cc=agruenba@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=cluster-devel@redhat.com \
--cc=hare@suse.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=rpeterso@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).