btrfs-convert-__process_pages_contig-to-use-filemap_get_folios_contig.patch removed from -mm tree
The quilt patch titled
Subject: btrfs: convert __process_pages_contig() to use filemap_get_folios_contig()
has been removed from the -mm tree. Its filename was
btrfs-convert-__process_pages_contig-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: btrfs: convert __process_pages_contig() to use filemap_get_folios_contig()
Date: Tue, 23 Aug 2022 17:40:18 -0700
Convert to use folios throughout. This is in preparation for the removal of find_get_pages_contig(). Now also supports large folios.
Since we may receive more than nr_pages pages, nr_pages may underflow. Since nr_pages > 0 is equivalent to index <= end_index, we replaced it with this check instead.
---
fs/btrfs/extent_io.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-)
fs/btrfs/extent_io.c renamed from fs/btrfs/extent_io.c~btrfs-convert-__process_pages_contig-to-use-filemap_get_folios_contig +15 -18
@@ -1900,9 +1900,8 @@ static int __process_pages_contig(structpgoff_t start_index = start >>PAGE_SHIFT ;pgoff_t end_index = end >>PAGE_SHIFT ;pgoff_t index = start_index; -unsigned long nr_pages = end_index - start_index +1 ;unsigned long pages_processed =0 ; -struct page *pages[16 ]; +struct folio_batch fbatch;int err =0 ;int i;
@@ -1911,16 +1910,17 @@ static int __process_pages_contig(structASSERT (processed_end && *processed_end == start); } -if ((page_ops &PAGE_SET_ERROR ) && nr_pages >0 ) +if ((page_ops &PAGE_SET_ERROR ) && start_index <= end_index)mapping_set_error (mapping, -EIO ); -while (nr_pages >0 ) { -int found_pages; +folio_batch_init (&fbatch); +while (index <= end_index) { +int found_folios; - found_pages =find_get_pages_contig (mapping, index, - min_t(unsigned long, - nr_pages,ARRAY_SIZE (pages)), pages); -if (found_pages ==0 ) { + found_folios =filemap_get_folios_contig (mapping, &index, + end_index, &fbatch); + +if (found_folios ==0 ) {/* * Only if we're going to lock these pages, we can find * nothing at @index.
@@ -1930,23 +1930,20 @@ static int __process_pages_contig(struct goto out; } -for (i =0 ; i < found_pages; i++) { +for (i =0 ; i < found_folios; i++) {int process_ret; - +struct folio *folio = fbatch.folios[i]; process_ret =process_one_page (fs_info, mapping, - pages[i], locked_page, page_ops, + &folio->page, locked_page, page_ops, start, end);if (process_ret <0 ) { -for (; i < found_pages; i++) -put_page (pages[i]); err = -EAGAIN ; +folio_batch_release (&fbatch); goto out; } -put_page (pages[i]); - pages_processed++; + pages_processed +=folio_nr_pages (folio); } - nr_pages -= found_pages; - index += found_pages; +folio_batch_release (&fbatch);cond_resched (); } out:
_
Patches currently in -mm which might be from [email protected] are
filemap-convert-filemap_range_has_writeback-to-use-folios.patch