Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 21:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

writeback: move the folio_prepare_writeback loop out of write_cache_pages()

Browse Source 
Move the loop for should-we-write-this-folio to writeback_get_folio.

[hch@lst.de: fold loop into existing helper instead of a separate one per Jan]
Link: https://lkml.kernel.org/r/20240215063649.2164017-13-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:47 +01:00 committed by Andrew Morton
parent e6d0ab87c8
commit a2cbc13638
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mm/page-writeback.c
View File

@ -2411,6 +2411,7 @@ static struct folio *writeback_get_folio(struct address_space *mapping,
{ {
struct folio *folio; struct folio *folio;
retry:
folio = folio_batch_next(&wbc->fbatch); folio = folio_batch_next(&wbc->fbatch);
if (!folio) { if (!folio) {
folio_batch_release(&wbc->fbatch); folio_batch_release(&wbc->fbatch);
@ -2418,8 +2419,17 @@ static struct folio *writeback_get_folio(struct address_space *mapping,
filemap_get_folios_tag(mapping, &wbc->index, wbc_end(wbc), filemap_get_folios_tag(mapping, &wbc->index, wbc_end(wbc),
wbc_to_tag(wbc), &wbc->fbatch); wbc_to_tag(wbc), &wbc->fbatch);
folio = folio_batch_next(&wbc->fbatch); folio = folio_batch_next(&wbc->fbatch);
if (!folio)
return NULL;
} }
folio_lock(folio);
if (unlikely(!folio_prepare_writeback(mapping, wbc, folio))) {
folio_unlock(folio);
goto retry;
}
trace_wbc_writepage(wbc, inode_to_bdi(mapping->host));
return folio; return folio;
} }
@ -2480,14 +2490,6 @@ int write_cache_pages(struct address_space *mapping,
if (!folio) if (!folio)
break; break;
folio_lock(folio);
if (!folio_prepare_writeback(mapping, wbc, folio)) {
folio_unlock(folio);
continue;
}
trace_wbc_writepage(wbc, inode_to_bdi(mapping->host));
error = writepage(folio, wbc, data); error = writepage(folio, wbc, data);
wbc->nr_to_write -= folio_nr_pages(folio); wbc->nr_to_write -= folio_nr_pages(folio);