nilfs2-convert-inode-file-to-be-folio-based.patch removed from -mm tree
The quilt patch titled
Subject: nilfs2: convert inode file to be folio-based
has been removed from the -mm tree. Its filename was
nilfs2-convert-inode-file-to-be-folio-based.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: Ryusuke Konishi <[email protected]>
Subject: nilfs2: convert inode file to be folio-based
Date: Thu, 24 Oct 2024 18:25:39 +0900
Convert the page-based implementation of ifile, a metadata file that manages inodes, to folio-based.
Signed-off-by Ryusuke Konishi <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/nilfs2/ifile.c | 10 +++++----- fs/nilfs2/ifile.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)
fs/nilfs2/ifile.c renamed from fs/nilfs2/ifile.c~nilfs2-convert-inode-file-to-be-folio-based +5 -5
@@ -98,7 +98,7 @@ int nilfs_ifile_delete_inode(struct inod .pr_entry_nr = ino, .pr_entry_bh = NULL };struct nilfs_inode *raw_inode; -void *kaddr; +size_t offset;int ret; ret =nilfs_palloc_prepare_free_entry (ifile, &req);
@@ -113,11 +113,11 @@ int nilfs_ifile_delete_inode(struct inodreturn ret; } - kaddr =kmap_local_page (req.pr_entry_bh->b_page); - raw_inode =nilfs_palloc_block_get_entry (ifile, req.pr_entry_nr, - req.pr_entry_bh, kaddr); + offset =nilfs_palloc_entry_offset (ifile, req.pr_entry_nr, + req.pr_entry_bh); + raw_inode =kmap_local_folio (req.pr_entry_bh->b_folio, offset); raw_inode->i_flags =0 ; -kunmap_local (kaddr); +kunmap_local (raw_inode);mark_buffer_dirty (req.pr_entry_bh);brelse (req.pr_entry_bh);
fs/nilfs2/ifile.h renamed from fs/nilfs2/ifile.h~nilfs2-convert-inode-file-to-be-folio-based +2 -2
@@ -21,9 +21,9 @@static inline struct nilfs_inode *nilfs_ifile_map_inode (struct inode *ifile,ino_t ino,struct buffer_head *ibh) { -void *kaddr =kmap_local_page (ibh->b_page); +size_t __offset_in_folio =nilfs_palloc_entry_offset (ifile, ino, ibh); -return nilfs_palloc_block_get_entry (ifile, ino, ibh, kaddr); +return kmap_local_folio (ibh->b_folio, __offset_in_folio); }static inline void nilfs_ifile_unmap_inode (struct nilfs_inode *raw_inode)
_
Patches currently in -mm which might be from [email protected] are