nilfs2: convert inode file to be folio-based

Convert the page-based implementation of ifile, a metadata file that
manages inodes, to folio-based.

Link: https://lkml.kernel.org/r/20241024092602.13395-6-konishi.ryusuke@gmail.com
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/nilfs2/ifile.c b/fs/nilfs2/ifile.c
index 1e86b93..e7339eb 100644 (file)
--- a/fs/nilfs2/ifile.c
+++ b/fs/nilfs2/ifile.c
@@ -98,7 +98,7 @@ int nilfs_ifile_delete_inode(struct inode *ifile, ino_t ino)
                .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 inode *ifile, ino_t ino)
                return 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);

diff --git a/fs/nilfs2/ifile.h b/fs/nilfs2/ifile.h
index 625545c..5d116a5 100644 (file)
--- a/fs/nilfs2/ifile.h
+++ b/fs/nilfs2/ifile.h
@@ -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)