nilfs2-convert-nilfs_page_count_clean_buffers-to-take-a-folio.patch removed from -mm tree
The quilt patch titled
Subject: nilfs2: convert nilfs_page_count_clean_buffers() to take a folio
has been removed from the -mm tree. Its filename was
nilfs2-convert-nilfs_page_count_clean_buffers-to-take-a-folio.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Matthew Wilcox (Oracle)" <[email protected]>
Subject: nilfs2: convert nilfs_page_count_clean_buffers() to take a folio
Date: Thu, 24 Oct 2024 18:25:44 +0900
Both callers have a folio, so pass it in and use it directly.
---
fs/nilfs2/dir.c | 2 +- fs/nilfs2/inode.c | 2 +- fs/nilfs2/page.c | 4 ++-- fs/nilfs2/page.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
fs/nilfs2/dir.c renamed from fs/nilfs2/dir.c~nilfs2-convert-nilfs_page_count_clean_buffers-to-take-a-folio +1 -1
@@ -95,7 +95,7 @@ static void nilfs_commit_chunk(struct founsigned 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 renamed from fs/nilfs2/inode.c~nilfs2-convert-nilfs_page_count_clean_buffers-to-take-a-folio +1 -1
@@ -242,7 +242,7 @@ static int nilfs_write_end(struct file *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 renamed from fs/nilfs2/page.c~nilfs2-convert-nilfs_page_count_clean_buffers-to-take-a-folio +2 -2
@@ -422,14 +422,14 @@ void nilfs_clear_folio_dirty(struct foli__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 renamed from fs/nilfs2/page.h~nilfs2-convert-nilfs_page_count_clean_buffers-to-take-a-folio +2 -2
@@ -43,8 +43,8 @@ int nilfs_copy_dirty_pages(struct addresvoid 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);
_
Patches currently in -mm which might be from [email protected] are
mm-convert-page_to_pgoff-to-page_pgoff.patch mm-use-page_pgoff-in-more-places.patch mm-renovate-page_address_in_vma.patch mm-mass-constification-of-folio-page-pointers.patch bootmem-stop-using-page-index.patch mm-remove-references-to-page-index-in-huge_memoryc.patch mm-use-page-private-instead-of-page-index-in-percpu.patch