From: Ryusuke Konishi <konishi.ryusuke@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox <willy@infradead.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 05/20] nilfs2: Convert to nilfs_folio_buffers_clean()
Date: Tue, 14 Nov 2023 17:44:21 +0900 [thread overview]
Message-ID: <20231114084436.2755-6-konishi.ryusuke@gmail.com> (raw)
In-Reply-To: <20231114084436.2755-1-konishi.ryusuke@gmail.com>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
All callers of nilfs_page_buffers_clean() now have a folio, so convert
it to take a folio. While I'm at it, make it return a bool.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
---
fs/nilfs2/page.c | 18 +++++++++---------
fs/nilfs2/page.h | 2 +-
fs/nilfs2/segment.c | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
index 3882acde1b3e..29799a49c234 100644
--- a/fs/nilfs2/page.c
+++ b/fs/nilfs2/page.c
@@ -81,7 +81,7 @@ void nilfs_forget_buffer(struct buffer_head *bh)
lock_buffer(bh);
set_mask_bits(&bh->b_state, clear_bits, 0);
- if (nilfs_page_buffers_clean(&folio->page))
+ if (nilfs_folio_buffers_clean(folio))
__nilfs_clear_page_dirty(&folio->page);
bh->b_blocknr = -1;
@@ -131,23 +131,23 @@ void nilfs_copy_buffer(struct buffer_head *dbh, struct buffer_head *sbh)
}
/**
- * nilfs_page_buffers_clean - check if a page has dirty buffers or not.
- * @page: page to be checked
+ * nilfs_folio_buffers_clean - Check if a folio has dirty buffers or not.
+ * @folio: Folio to be checked.
*
- * nilfs_page_buffers_clean() returns zero if the page has dirty buffers.
- * Otherwise, it returns non-zero value.
+ * nilfs_folio_buffers_clean() returns false if the folio has dirty buffers.
+ * Otherwise, it returns true.
*/
-int nilfs_page_buffers_clean(struct page *page)
+bool nilfs_folio_buffers_clean(struct folio *folio)
{
struct buffer_head *bh, *head;
- bh = head = page_buffers(page);
+ bh = head = folio_buffers(folio);
do {
if (buffer_dirty(bh))
- return 0;
+ return false;
bh = bh->b_this_page;
} while (bh != head);
- return 1;
+ return true;
}
void nilfs_page_bug(struct page *page)
diff --git a/fs/nilfs2/page.h b/fs/nilfs2/page.h
index d249ea1cefff..a8ab800e689c 100644
--- a/fs/nilfs2/page.h
+++ b/fs/nilfs2/page.h
@@ -36,7 +36,7 @@ struct buffer_head *nilfs_grab_buffer(struct inode *, struct address_space *,
unsigned long, unsigned long);
void nilfs_forget_buffer(struct buffer_head *);
void nilfs_copy_buffer(struct buffer_head *, struct buffer_head *);
-int nilfs_page_buffers_clean(struct page *);
+bool nilfs_folio_buffers_clean(struct folio *);
void nilfs_page_bug(struct page *);
int nilfs_copy_dirty_pages(struct address_space *, struct address_space *);
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 2a058aad5c2d..888b8606a1e8 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -1759,7 +1759,7 @@ static void nilfs_end_folio_io(struct folio *folio, int err)
* all the buffers get cleaned later.
*/
folio_lock(folio);
- if (nilfs_page_buffers_clean(&folio->page))
+ if (nilfs_folio_buffers_clean(folio))
__nilfs_clear_page_dirty(&folio->page);
folio_unlock(folio);
}
@@ -1767,7 +1767,7 @@ static void nilfs_end_folio_io(struct folio *folio, int err)
}
if (!err) {
- if (!nilfs_page_buffers_clean(&folio->page))
+ if (!nilfs_folio_buffers_clean(folio))
filemap_dirty_folio(folio->mapping, folio);
folio_clear_error(folio);
} else {
--
2.34.1
next prev parent reply other threads:[~2023-11-14 8:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-14 8:44 [PATCH 00/20] nilfs2: Folio conversions for file paths Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 01/20] nilfs2: Add nilfs_end_folio_io() Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 02/20] nilfs2: Convert nilfs_abort_logs to use folios Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 03/20] nilfs2: Convert nilfs_segctor_complete_write " Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 04/20] nilfs2: Convert nilfs_forget_buffer to use a folio Ryusuke Konishi
2023-11-14 8:44 ` Ryusuke Konishi [this message]
2023-11-14 8:44 ` [PATCH 06/20] nilfs2: Convert nilfs_writepage() " Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 07/20] nilfs2: Convert nilfs_mdt_write_page() " Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 08/20] nilfs2: Convert to nilfs_clear_folio_dirty() Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 09/20] nilfs2: Convert to __nilfs_clear_folio_dirty() Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 10/20] nilfs2: Convert nilfs_segctor_prepare_write to use folios Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 11/20] nilfs2: Convert nilfs_page_mkwrite() to use a folio Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 12/20] nilfs2: Convert nilfs_mdt_create_block " Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 13/20] nilfs2: Convert nilfs_mdt_submit_block " Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 14/20] nilfs2: Convert nilfs_gccache_submit_read_data " Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 15/20] nilfs2: Convert nilfs_btnode_create_block " Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 16/20] nilfs2: Convert nilfs_btnode_submit_block " Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 17/20] nilfs2: Convert nilfs_btnode_delete " Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 18/20] nilfs2: Convert nilfs_btnode_prepare_change_key " Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 19/20] nilfs2: Convert nilfs_btnode_commit_change_key " Ryusuke Konishi
2023-11-14 8:44 ` [PATCH 20/20] nilfs2: Convert nilfs_btnode_abort_change_key " Ryusuke Konishi
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=20231114084436.2755-6-konishi.ryusuke@gmail.com \
--to=konishi.ryusuke@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=willy@infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®