From: "Vishal Moola (Oracle)" <vishal.moola@gmail.com>
To: linux-fsdevel@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org, linux-nilfs@vger.kernel.org,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
"Vishal Moola (Oracle)" <vishal.moola@gmail.com>
Subject: [PATCH v2 3/7] btrfs: Convert end_compressed_writeback() to use filemap_get_folios()
Date: Tue, 16 Aug 2022 10:52:42 -0700 [thread overview]
Message-ID: <20220816175246.42401-4-vishal.moola@gmail.com> (raw)
In-Reply-To: <20220816175246.42401-1-vishal.moola@gmail.com>
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.
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
---
fs/btrfs/compression.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index f4564f32f6d9..3dcd5006cfb4 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -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>
@@ -339,8 +340,7 @@ static noinline void end_compressed_writeback(struct inode *inode,
struct 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;
@@ -348,24 +348,22 @@ static noinline void end_compressed_writeback(struct inode *inode,
if (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);
+ folio_batch_init(&fbatch);
+ while (index <= end_index) {
+ ret = filemap_get_folios(inode->i_mapping, &index, end_index,
+ &fbatch);
+
if (ret == 0) {
- nr_pages -= 1;
- index += 1;
- continue;
+ 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 */
}
--
2.36.1
next prev parent reply other threads:[~2022-08-16 17:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-16 17:52 [PATCH v2 0/7] Convert to filemap_get_folios_contig() Vishal Moola (Oracle)
2022-08-16 17:52 ` [PATCH v2 1/7] filemap: Add filemap_get_folios_contig() Vishal Moola (Oracle)
2022-08-16 17:52 ` [PATCH v2 2/7] btrfs: Convert __process_pages_contig() to use filemap_get_folios_contig() Vishal Moola (Oracle)
2022-08-22 18:32 ` Vishal Moola
2022-08-23 20:35 ` David Sterba
2022-08-16 17:52 ` Vishal Moola (Oracle) [this message]
2022-08-23 20:36 ` [PATCH v2 3/7] btrfs: Convert end_compressed_writeback() to use filemap_get_folios() David Sterba
2022-08-16 17:52 ` [PATCH v2 4/7] btrfs: Convert process_page_range() to use filemap_get_folios_contig() Vishal Moola (Oracle)
2022-08-23 20:38 ` David Sterba
2022-08-16 17:52 ` [PATCH v2 5/7] nilfs2: Convert nilfs_find_uncommited_extent() " Vishal Moola (Oracle)
2022-08-17 4:33 ` Ryusuke Konishi
2022-08-17 20:35 ` Vishal Moola
2022-08-16 17:52 ` [PATCH v2 6/7] ramfs: Convert ramfs_nommu_get_unmapped_area() " Vishal Moola (Oracle)
2022-08-16 17:52 ` [PATCH v2 7/7] filemap: Remove find_get_pages_contig() Vishal Moola (Oracle)
2022-08-23 17:26 ` [PATCH v2 0/7] Convert to filemap_get_folios_contig() David Sterba
2022-08-23 18:02 ` Matthew Wilcox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220816175246.42401-4-vishal.moola@gmail.com \
--to=vishal.moola@gmail.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nilfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).