Commit a2cbc136 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

writeback: move the folio_prepare_writeback loop out of write_cache_pages() 

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: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Acked-by: default avatarDave Chinner <dchinner@redhat.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e6d0ab87

mm/page-writeback.c

+10 −8
Original line number Diff line number Diff line
@@ -2411,6 +2411,7 @@ static struct folio *writeback_get_folio(struct address_space *mapping, 
{

	struct folio *folio;



retry:

	folio = folio_batch_next(&wbc->fbatch);

	if (!folio) {

		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),

				wbc_to_tag(wbc), &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;

}
@@ -2480,14 +2490,6 @@ int write_cache_pages(struct address_space *mapping, 
		if (!folio)

			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);

		wbc->nr_to_write -= folio_nr_pages(folio);