torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

nilfs2: convert nilfs_page_count_clean_buffers() to take a folio

Browse Source 
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: 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) 2024-10-24 18:25:44 +09:00 committed by Andrew Morton
parent 310293201e
commit c1d73eb8d0
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nilfs2/dir.c
View File

@ -95,7 +95,7 @@ static void nilfs_commit_chunk(struct folio *folio,
unsigned int nr_dirty; unsigned int nr_dirty;
int err; 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); copied = block_write_end(NULL, mapping, pos, len, len, folio, NULL);
if (pos + copied > dir->i_size) if (pos + copied > dir->i_size)
i_size_write(dir, pos + copied); i_size_write(dir, pos + copied);

2
fs/nilfs2/inode.c
View File

@ -242,7 +242,7 @@ static int nilfs_write_end(struct file *file, struct address_space *mapping,
unsigned int nr_dirty; unsigned int nr_dirty;
int err; int err;
nr_dirty = nilfs_page_count_clean_buffers(&folio->page, start, nr_dirty = nilfs_page_count_clean_buffers(folio, start,
start + copied); start + copied);
copied = generic_write_end(file, mapping, pos, len, copied, folio, copied = generic_write_end(file, mapping, pos, len, copied, folio,
fsdata); fsdata);

4
fs/nilfs2/page.c
View File

@ -422,14 +422,14 @@ void nilfs_clear_folio_dirty(struct folio *folio)
__nilfs_clear_folio_dirty(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 from, unsigned int to)
{ {
unsigned int block_start, block_end; unsigned int block_start, block_end;
struct buffer_head *bh, *head; struct buffer_head *bh, *head;
unsigned int nc = 0; 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; bh != head || !block_start;
block_start = block_end, bh = bh->b_this_page) { block_start = block_end, bh = bh->b_this_page) {
block_end = block_start + bh->b_size; block_end = block_start + bh->b_size;

4
fs/nilfs2/page.h
View File

@ -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_copy_back_pages(struct address_space *, struct address_space *);
void nilfs_clear_folio_dirty(struct folio *folio); void nilfs_clear_folio_dirty(struct folio *folio);
void nilfs_clear_dirty_pages(struct address_space *mapping); void nilfs_clear_dirty_pages(struct address_space *mapping);
unsigned int nilfs_page_count_clean_buffers(struct page *, unsigned int, unsigned int nilfs_page_count_clean_buffers(struct folio *folio,
unsigned int); unsigned int from, unsigned int to);
unsigned long nilfs_find_uncommitted_extent(struct inode *inode, unsigned long nilfs_find_uncommitted_extent(struct inode *inode,
sector_t start_blk, sector_t start_blk,
sector_t *blkoff); sector_t *blkoff);