Commit 819da022 authored by Vishal Moola (Oracle)'s avatar Vishal Moola (Oracle) Committed by David Howells

afs: Fix waiting for writeback then skipping folio

Commit acc8d858 converted afs_writepages_region() to write back a
folio batch. The function waits for writeback to a folio, but then
proceeds to the rest of the batch without trying to write that folio
again. This patch fixes has it attempt to write the folio again.

[DH: Also remove an 'else' that adding a goto makes redundant]

Fixes: acc8d858 ("afs: convert afs_writepages_region() to use filemap_get_folios_tag()")
Signed-off-by: default avatarVishal Moola (Oracle) <vishal.moola@gmail.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Link: https://lore.kernel.org/r/20230607204120.89416-2-vishal.moola@gmail.com/
parent a2b6f2ab
...@@ -731,6 +731,7 @@ static int afs_writepages_region(struct address_space *mapping, ...@@ -731,6 +731,7 @@ static int afs_writepages_region(struct address_space *mapping,
* (changing page->mapping to NULL), or even swizzled * (changing page->mapping to NULL), or even swizzled
* back from swapper_space to tmpfs file mapping * back from swapper_space to tmpfs file mapping
*/ */
try_again:
if (wbc->sync_mode != WB_SYNC_NONE) { if (wbc->sync_mode != WB_SYNC_NONE) {
ret = folio_lock_killable(folio); ret = folio_lock_killable(folio);
if (ret < 0) { if (ret < 0) {
...@@ -757,9 +758,10 @@ static int afs_writepages_region(struct address_space *mapping, ...@@ -757,9 +758,10 @@ static int afs_writepages_region(struct address_space *mapping,
#ifdef CONFIG_AFS_FSCACHE #ifdef CONFIG_AFS_FSCACHE
folio_wait_fscache(folio); folio_wait_fscache(folio);
#endif #endif
} else { goto try_again;
start += folio_size(folio);
} }
start += folio_size(folio);
if (wbc->sync_mode == WB_SYNC_NONE) { if (wbc->sync_mode == WB_SYNC_NONE) {
if (skips >= 5 || need_resched()) { if (skips >= 5 || need_resched()) {
*_next = start; *_next = start;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment