Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-17 18:36:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

writeback: use the folio_batch queue iterator

Browse Source 
Instead of keeping our own local iterator variable, use the one just added
to folio_batch.

Link: https://lkml.kernel.org/r/20240215063649.2164017-12-hch@lst.de
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Acked-by: Dave Chinner <dchinner@redhat.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2024-02-15 07:36:46 +01:00 committed by Andrew Morton
parent 535c5d9dad
commit e6d0ab87c8
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mm/page-writeback.c
View File

@ -2406,13 +2406,21 @@ static pgoff_t wbc_end(struct writeback_control *wbc)
return wbc->range_end >> PAGE_SHIFT; return wbc->range_end >> PAGE_SHIFT;
} }
static void writeback_get_batch(struct address_space *mapping, static struct folio *writeback_get_folio(struct address_space *mapping,
struct writeback_control *wbc) struct writeback_control *wbc)
{ {
folio_batch_release(&wbc->fbatch); struct folio *folio;
cond_resched();
filemap_get_folios_tag(mapping, &wbc->index, wbc_end(wbc), folio = folio_batch_next(&wbc->fbatch);
wbc_to_tag(wbc), &wbc->fbatch); if (!folio) {
folio_batch_release(&wbc->fbatch);
cond_resched();
filemap_get_folios_tag(mapping, &wbc->index, wbc_end(wbc),
wbc_to_tag(wbc), &wbc->fbatch);
folio = folio_batch_next(&wbc->fbatch);
}
return folio;
} }
/** /**
@ -2454,7 +2462,6 @@ int write_cache_pages(struct address_space *mapping,
int error; int error;
struct folio *folio; struct folio *folio;
pgoff_t end; /* Inclusive */ pgoff_t end; /* Inclusive */
int i = 0;
if (wbc->range_cyclic) { if (wbc->range_cyclic) {
wbc->index = mapping->writeback_index; /* prev offset */ wbc->index = mapping->writeback_index; /* prev offset */
@ -2469,15 +2476,10 @@ int write_cache_pages(struct address_space *mapping,
folio_batch_init(&wbc->fbatch); folio_batch_init(&wbc->fbatch);
for (;;) { for (;;) {
if (i == wbc->fbatch.nr) { folio = writeback_get_folio(mapping, wbc);
writeback_get_batch(mapping, wbc); if (!folio)
i = 0;
}
if (wbc->fbatch.nr == 0)
break; break;
folio = wbc->fbatch.folios[i++];
folio_lock(folio); folio_lock(folio);
if (!folio_prepare_writeback(mapping, wbc, folio)) { if (!folio_prepare_writeback(mapping, wbc, folio)) {
folio_unlock(folio); folio_unlock(folio);