diff options
| author | Vishal Moola (Oracle) <vishal.moola@gmail.com> | 2023-06-07 13:41:20 -0700 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2023-06-19 14:30:58 +0100 |
| commit | 819da022dd007398d0c42ebcd8dbb1b681acea53 (patch) | |
| tree | 7482d29ddb7a3c9c7dbf9302e3128caf7eb3879c | |
| parent | a2b6f2ab3e144f8e23666aafeba0e4d9ea4b7975 (diff) | |
| download | linux-819da022dd007398d0c42ebcd8dbb1b681acea53.tar.gz | |
afs: Fix waiting for writeback then skipping folio
Commit acc8d8588cb7 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: acc8d8588cb7 ("afs: convert afs_writepages_region() to use filemap_get_folios_tag()")
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Signed-off-by: David 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/
| -rw-r--r-- | fs/afs/write.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/afs/write.c b/fs/afs/write.c index fd433024070e51..8750b99c3f566d 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c @@ -731,6 +731,7 @@ static int afs_writepages_region(struct address_space *mapping, * (changing page->mapping to NULL), or even swizzled * back from swapper_space to tmpfs file mapping */ +try_again: if (wbc->sync_mode != WB_SYNC_NONE) { ret = folio_lock_killable(folio); if (ret < 0) { @@ -757,9 +758,10 @@ static int afs_writepages_region(struct address_space *mapping, #ifdef CONFIG_AFS_FSCACHE folio_wait_fscache(folio); #endif - } else { - start += folio_size(folio); + goto try_again; } + + start += folio_size(folio); if (wbc->sync_mode == WB_SYNC_NONE) { if (skips >= 5 || need_resched()) { *_next = start; |