btrfs-convert-end_compressed_writeback-to-use-filemap_get_folios.patch removed from -mm tree
The quilt patch titled
Subject: btrfs: convert end_compressed_writeback() to use filemap_get_folios()
has been removed from the -mm tree. Its filename was
btrfs-convert-end_compressed_writeback-to-use-filemap_get_folios.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 end_compressed_writeback() to use filemap_get_folios()
Date: Tue, 23 Aug 2022 17:40:19 -0700
Converted function 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.
Also this function does not care about the pages being contiguous so we can just use filemap_get_folios() to be more efficient.
---
fs/btrfs/compression.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)
fs/btrfs/compression.c renamed from fs/btrfs/compression.c~btrfs-convert-end_compressed_writeback-to-use-filemap_get_folios +15 -16
@@ -8,6 +8,7 @@#include <linux/file.h> #include <linux/fs.h> #include <linux/pagemap.h> +#include <linux/pagevec.h> #include <linux/highmem.h> #include <linux/kthread.h> #include <linux/time.h>
@@ -222,8 +223,7 @@ static noinline void end_compressed_writstruct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);unsigned long index = cb->start >>PAGE_SHIFT ;unsigned long end_index = (cb->start + cb->len -1 ) >>PAGE_SHIFT ; -struct page *pages[16 ]; -unsigned long nr_pages = end_index - index +1 ; +struct folio_batch fbatch;const int errno =blk_status_to_errno (cb->status);int i;int ret;
@@ -231,24 +231,23 @@ static noinline void end_compressed_writif (errno)mapping_set_error (inode->i_mapping, errno); -while (nr_pages >0 ) { - ret =find_get_pages_contig (inode->i_mapping, index, - min_t(unsigned long, - nr_pages,ARRAY_SIZE (pages)), pages); -if (ret ==0 ) { - nr_pages -=1 ; - index +=1 ; -continue ; - } +folio_batch_init (&fbatch); +while (index <= end_index) { + ret =filemap_get_folios (inode->i_mapping, &index, end_index, + &fbatch); + +if (ret ==0 ) +return ; +for (i =0 ; i < ret; i++) { +struct folio *folio = fbatch.folios[i]; +if (errno) -SetPageError (pages[i]); -btrfs_page_clamp_clear_writeback (fs_info, pages[i], +folio_set_error (folio); +btrfs_page_clamp_clear_writeback (fs_info, &folio->page, cb->start, cb->len); -put_page (pages[i]); } - nr_pages -= ret; - index += ret; +folio_batch_release (&fbatch); }/* the inode may be gone now */ }
_
Patches currently in -mm which might be from [email protected] are
filemap-convert-filemap_range_has_writeback-to-use-folios.patch