Commit c1d73eb8 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

nilfs2: convert nilfs_page_count_clean_buffers() to take a folio 

Both callers have a folio, so pass it in and use it directly.

[konishi.ryusuke@gmail.com: fixed a checkpatch warning about function declaration]
Link: https://lkml.kernel.org/r/20241002150036.1339475-3-willy@infradead.org
Link: https://lkml.kernel.org/r/20241024092602.13395-11-konishi.ryusuke@gmail.com


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 31029320

fs/nilfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static void nilfs_commit_chunk(struct folio *folio, 
	unsigned int nr_dirty;

	int err;



	nr_dirty = nilfs_page_count_clean_buffers(&folio->page, from, to);

	nr_dirty = nilfs_page_count_clean_buffers(folio, from, to);

	copied = block_write_end(NULL, mapping, pos, len, len, folio, NULL);

	if (pos + copied > dir->i_size)

		i_size_write(dir, pos + copied);

fs/nilfs2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static int nilfs_write_end(struct file *file, struct address_space *mapping, 
	unsigned int nr_dirty;

	int err;



	nr_dirty = nilfs_page_count_clean_buffers(&folio->page, start,

	nr_dirty = nilfs_page_count_clean_buffers(folio, start,

						  start + copied);

	copied = generic_write_end(file, mapping, pos, len, copied, folio,

				   fsdata);

fs/nilfs2/page.c

+2 −2
Original line number Diff line number Diff line
@@ -422,14 +422,14 @@ void nilfs_clear_folio_dirty(struct folio *folio) 
	__nilfs_clear_folio_dirty(folio);

}



unsigned int nilfs_page_count_clean_buffers(struct page *page,

unsigned int nilfs_page_count_clean_buffers(struct folio *folio,

					    unsigned int from, unsigned int to)

{

	unsigned int block_start, block_end;

	struct buffer_head *bh, *head;

	unsigned int nc = 0;



	for (bh = head = page_buffers(page), block_start = 0;

	for (bh = head = folio_buffers(folio), block_start = 0;

	     bh != head || !block_start;

	     block_start = block_end, bh = bh->b_this_page) {

		block_end = block_start + bh->b_size;

fs/nilfs2/page.h

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ int nilfs_copy_dirty_pages(struct address_space *, struct address_space *); 
void nilfs_copy_back_pages(struct address_space *, struct address_space *);

void nilfs_clear_folio_dirty(struct folio *folio);

void nilfs_clear_dirty_pages(struct address_space *mapping);

unsigned int nilfs_page_count_clean_buffers(struct page *, unsigned int,

					    unsigned int);

unsigned int nilfs_page_count_clean_buffers(struct folio *folio,

		unsigned int from, unsigned int to);

unsigned long nilfs_find_uncommitted_extent(struct inode *inode,

					    sector_t start_blk,

					    sector_t *blkoff);