nilfs2: convert nilfs_lookup_dirty_node_buffers() to use filemap_get_folios_tag()
authorVishal Moola (Oracle) <vishal.moola@gmail.com>
Wed, 4 Jan 2023 21:14:44 +0000 (13:14 -0800)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 3 Feb 2023 06:33:17 +0000 (22:33 -0800)
Convert function to use folios throughout.  This is in preparation for the
removal of find_get_pages_range_tag().  This change removes 1 call to
compound_head().

Link: https://lkml.kernel.org/r/20230104211448.4804-20-vishal.moola@gmail.com
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Acked-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
fs/nilfs2/segment.c

index c17db9a..19446a8 100644 (file)
@@ -737,20 +737,19 @@ static void nilfs_lookup_dirty_node_buffers(struct inode *inode,
 {
        struct nilfs_inode_info *ii = NILFS_I(inode);
        struct inode *btnc_inode = ii->i_assoc_inode;
-       struct pagevec pvec;
+       struct folio_batch fbatch;
        struct buffer_head *bh, *head;
        unsigned int i;
        pgoff_t index = 0;
 
        if (!btnc_inode)
                return;
+       folio_batch_init(&fbatch);
 
-       pagevec_init(&pvec);
-
-       while (pagevec_lookup_tag(&pvec, btnc_inode->i_mapping, &index,
-                                       PAGECACHE_TAG_DIRTY)) {
-               for (i = 0; i < pagevec_count(&pvec); i++) {
-                       bh = head = page_buffers(pvec.pages[i]);
+       while (filemap_get_folios_tag(btnc_inode->i_mapping, &index,
+                               (pgoff_t)-1, PAGECACHE_TAG_DIRTY, &fbatch)) {
+               for (i = 0; i < folio_batch_count(&fbatch); i++) {
+                       bh = head = folio_buffers(fbatch.folios[i]);
                        do {
                                if (buffer_dirty(bh) &&
                                                !buffer_async_write(bh)) {
@@ -761,7 +760,7 @@ static void nilfs_lookup_dirty_node_buffers(struct inode *inode,
                                bh = bh->b_this_page;
                        } while (bh != head);
                }
-               pagevec_release(&pvec);
+               folio_batch_release(&fbatch);
                cond_resched();
        }
 }