github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 23:22:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

nilfs2: convert to nilfs_folio_buffers_clean()

Browse Source 
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.

Link: https://lkml.kernel.org/r/20231114084436.2755-6-konishi.ryusuke@gmail.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2023-11-14 17:44:21 +09:00 committed by Andrew Morton
parent 797e25ad10
commit 36319c0c1c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/nilfs2/page.c
View File

@ -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)

2
fs/nilfs2/page.h
View File

@ -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 *);

4
fs/nilfs2/segment.c
View File

@ -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 {