Skip to content

Commit f8b6a94

Browse files
joannekoongbrauner
authored andcommitted
iomap: move folio_unlock out of iomap_writeback_folio
Move unlocking the folio out of iomap_writeback_folio into the caller. This means the end writeback machinery is now run with the folio locked when no writeback happened, or writeback completed extremely fast. Note that having the folio locked over the call to folio_end_writeback in iomap_writeback_folio means that the dropbehind handling there will never run because the trylock fails. The only way this can happen is if the writepage either never wrote back any dirty data at all, in which case the dropbehind handling isn't needed, or if all writeback finished instantly, which is rather unlikely. Even in the latter case the dropbehind handling is an optional optimization so skipping it will not cause correctness issues. This prepares for exporting iomap_writeback_folio for use in folio laundering. Signed-off-by: Joanne Koong <[email protected]> [hch: split from a larger patch] Signed-off-by: Christoph Hellwig <[email protected]> Link: https://lore.kernel.org/[email protected] Reviewed-by: Darrick J. Wong <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 58f0d5a commit f8b6a94

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

fs/iomap/buffered-io.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,10 +1652,8 @@ static int iomap_writeback_folio(struct iomap_writepage_ctx *wpc,
16521652

16531653
trace_iomap_writeback_folio(inode, pos, folio_size(folio));
16541654

1655-
if (!iomap_writeback_handle_eof(folio, inode, &end_pos)) {
1656-
folio_unlock(folio);
1655+
if (!iomap_writeback_handle_eof(folio, inode, &end_pos))
16571656
return 0;
1658-
}
16591657
WARN_ON_ONCE(end_pos <= pos);
16601658

16611659
if (i_blocks_per_folio(inode, folio) > 1) {
@@ -1709,7 +1707,6 @@ static int iomap_writeback_folio(struct iomap_writepage_ctx *wpc,
17091707
* already at this point. In that case we need to clear the writeback
17101708
* bit ourselves right after unlocking the page.
17111709
*/
1712-
folio_unlock(folio);
17131710
if (ifs) {
17141711
if (atomic_dec_and_test(&ifs->write_bytes_pending))
17151712
folio_end_writeback(folio);
@@ -1736,8 +1733,10 @@ iomap_writepages(struct iomap_writepage_ctx *wpc)
17361733
PF_MEMALLOC))
17371734
return -EIO;
17381735

1739-
while ((folio = writeback_iter(mapping, wpc->wbc, folio, &error)))
1736+
while ((folio = writeback_iter(mapping, wpc->wbc, folio, &error))) {
17401737
error = iomap_writeback_folio(wpc, folio);
1738+
folio_unlock(folio);
1739+
}
17411740

17421741
/*
17431742
* If @error is non-zero, it means that we have a situation where some

0 commit comments

Comments
 (0)