diff mbox series

[01/17] writeback: fix done_index when hitting the wbc->nr_to_write

Message ID 20231218153553.807799-2-hch@lst.de (mailing list archive)
State New, archived
Headers show
Series [01/17] writeback: fix done_index when hitting the wbc->nr_to_write | expand

Commit Message

Christoph Hellwig Dec. 18, 2023, 3:35 p.m. UTC
When write_cache_pages finishes writing out a folio, it fails to update
done_inde to account for the number of pages in the folio just written.
That means when range_cyclic writeback is restarted, it will be
restarted at this folio instead of after it as it should.  Fix that
by updating done_index before breaking out of the loop.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 mm/page-writeback.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Jan Kara Dec. 19, 2023, 5:33 p.m. UTC | #1
On Mon 18-12-23 16:35:37, Christoph Hellwig wrote:
> When write_cache_pages finishes writing out a folio, it fails to update
> done_inde to account for the number of pages in the folio just written.
  ^^^ done_index

> That means when range_cyclic writeback is restarted, it will be
> restarted at this folio instead of after it as it should.  Fix that
> by updating done_index before breaking out of the loop.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Otherwise looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  mm/page-writeback.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/mm/page-writeback.c b/mm/page-writeback.c
> index ee2fd6a6af4072..b13ea243edb6b2 100644
> --- a/mm/page-writeback.c
> +++ b/mm/page-writeback.c
> @@ -2505,6 +2505,7 @@ int write_cache_pages(struct address_space *mapping,
>  			 * keep going until we have written all the pages
>  			 * we tagged for writeback prior to entering this loop.
>  			 */
> +			done_index = folio->index + nr;
>  			wbc->nr_to_write -= nr;
>  			if (wbc->nr_to_write <= 0 &&
>  			    wbc->sync_mode == WB_SYNC_NONE) {
> -- 
> 2.39.2
>
diff mbox series

Patch

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index ee2fd6a6af4072..b13ea243edb6b2 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -2505,6 +2505,7 @@  int write_cache_pages(struct address_space *mapping,
 			 * keep going until we have written all the pages
 			 * we tagged for writeback prior to entering this loop.
 			 */
+			done_index = folio->index + nr;
 			wbc->nr_to_write -= nr;
 			if (wbc->nr_to_write <= 0 &&
 			    wbc->sync_mode == WB_SYNC_NONE) {