nilfs2-convert-nilfs_find_uncommited_extent-to-use-filemap_get_folios_contig.patch removed from -mm tree
The quilt patch titled
Subject: nilfs2: convert nilfs_find_uncommited_extent() to use filemap_get_folios_contig()
has been removed from the -mm tree. Its filename was
nilfs2-convert-nilfs_find_uncommited_extent-to-use-filemap_get_folios_contig.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Vishal Moola (Oracle)" <[email protected]>
Subject: nilfs2: convert nilfs_find_uncommited_extent() to use filemap_get_folios_contig()
Date: Tue, 23 Aug 2022 17:40:21 -0700
Convert function to use folios throughout. This is in preparation for the removal of find_get_pages_contig(). Now also supports large folios.
Also clean up an unnecessary if statement - pvec.pages[0]->index > index will always evaluate to false, and filemap_get_folios_contig() returns 0 if there is no folio found at index.
---
fs/nilfs2/page.c | 45 ++++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 27 deletions(-)
fs/nilfs2/page.c renamed from fs/nilfs2/page.c~nilfs2-convert-nilfs_find_uncommited_extent-to-use-filemap_get_folios_contig +18 -27
@@ -480,41 +480,36 @@ unsigned long nilfs_find_uncommitted_extsector_t start_blk, sector_t *blkoff) { - unsigned int i; + unsigned int i, nr_folios;pgoff_t index; -unsigned int nblocks_in_page;unsigned long length =0 ; -sector_t b; -struct pagevec pvec; -struct page *page; +struct folio_batch fbatch; +struct folio *folio;if (inode->i_mapping->nrpages ==0 )return 0 ; index = start_blk >> (PAGE_SHIFT - inode->i_blkbits); - nblocks_in_page =1U << (PAGE_SHIFT - inode->i_blkbits); -pagevec_init (&pvec); +folio_batch_init (&fbatch); repeat: - pvec.nr =find_get_pages_contig (inode->i_mapping, index,PAGEVEC_SIZE , - pvec.pages); -if (pvec.nr ==0 ) + nr_folios =filemap_get_folios_contig (inode->i_mapping, &index,ULONG_MAX , + &fbatch); +if (nr_folios ==0 )return length; -if (length >0 && pvec.pages[0 ]->index > index) - goto out; - - b = pvec.pages[0 ]->index << (PAGE_SHIFT - inode->i_blkbits); i =0 ; do { - page = pvec.pages[i]; + folio = fbatch.folios[i]; - lock_page(page); - if (page_has_buffers(page)) { + folio_lock(folio); + if (folio_buffers(folio)) { struct buffer_head *bh, *head; + sector_t b; - bh = head = page_buffers(page); + b = folio->index << (PAGE_SHIFT - inode->i_blkbits); + bh = head = folio_buffers(folio); do { if (b < start_blk) continue;
@@ -529,21 +524,17 @@ repeat: }else {if (length >0 ) goto out_locked; - - b += nblocks_in_page; } -unlock_page (page); +folio_unlock (folio); - }while (++i <pagevec_count (&pvec)); + }while (++i < nr_folios); - index = page->index +1 ; -pagevec_release (&pvec); +folio_batch_release (&fbatch);cond_resched (); goto repeat; out_locked: -unlock_page (page); -out: -pagevec_release (&pvec); +folio_unlock (folio); +folio_batch_release (&fbatch);return length; }
_
Patches currently in -mm which might be from [email protected] are
filemap-convert-filemap_range_has_writeback-to-use-folios.patch