nilfs2-convert-nilfs_recovery_copy_block-to-take-a-folio.patch removed from -mm tree
The quilt patch titled
Subject: nilfs2: convert nilfs_recovery_copy_block() to take a folio
has been removed from the -mm tree. Its filename was
nilfs2-convert-nilfs_recovery_copy_block-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_recovery_copy_block() to take a folio
Date: Thu, 24 Oct 2024 18:25:45 +0900
Use memcpy_to_folio() instead of open-coding it, and use offset_in_folio() in case anybody wants to use nilfs2 on a device with large blocks.
---
fs/nilfs2/recovery.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
fs/nilfs2/recovery.c renamed from fs/nilfs2/recovery.c~nilfs2-convert-nilfs_recovery_copy_block-to-take-a-folio +7 -10
@@ -481,19 +481,16 @@ static int nilfs_prepare_segment_for_recstatic int nilfs_recovery_copy_block (struct the_nilfs *nilfs,struct nilfs_recovery_block *rb, -loff_t pos,struct page *page) +loff_t pos,struct folio *folio) {struct buffer_head *bh_org; -size_t from = pos & ~PAGE_MASK ; -void *kaddr; +size_t from =offset_in_folio (folio, pos); bh_org =__bread (nilfs->ns_bdev, rb->blocknr, nilfs->ns_blocksize);if (unlikely (!bh_org))return -EIO ; - kaddr =kmap_local_page (page); -memcpy (kaddr + from, bh_org->b_data, bh_org->b_size); -kunmap_local (kaddr); +memcpy_to_folio (folio, from, bh_org->b_data, bh_org->b_size);brelse (bh_org);return 0 ; }
@@ -531,13 +528,13 @@ static int nilfs_recover_dsync_blocks(st goto failed_inode; } - err =nilfs_recovery_copy_block (nilfs, rb, pos, &folio->page); + err =nilfs_recovery_copy_block (nilfs, rb, pos, folio);if (unlikely (err)) - goto failed_page; + goto failed_folio; err =nilfs_set_file_dirty (inode,1 );if (unlikely (err)) - goto failed_page; + goto failed_folio;block_write_end (NULL , inode->i_mapping, pos, blocksize, blocksize, folio,NULL );
@@ -548,7 +545,7 @@ static int nilfs_recover_dsync_blocks(st (*nr_salvaged_blocks)++; goto next; - failed_page: + failed_folio:folio_unlock (folio);folio_put (folio);
_
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