diff options
| author | Matthew Wilcox (Oracle) <[email protected]> | 2024-07-18 23:30:02 +0100 |
|---|---|---|
| committer | Theodore Ts'o <[email protected]> | 2024-08-26 21:47:04 -0400 |
| commit | 3e3a693551c3e9b45575e94ca2d1d670a47b3fcc (patch) | |
| tree | 4b9b48d9bf4a730f60fd81954fc961e5fb9a9149 | |
| parent | a40759fb16ae839f8c769174fde017564ea564ff (diff) | |
ext4: tidy the BH loop in mext_page_mkuptodate()
This for loop is somewhat hard to read; turn it into a normal BH
do-while loop.
Signed-off-by: Matthew Wilcox (Oracle) <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Theodore Ts'o <[email protected]>
| -rw-r--r-- | fs/ext4/move_extent.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index 660bf34a5c4b..516897b0218e 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c @@ -187,9 +187,11 @@ static int mext_page_mkuptodate(struct folio *folio, size_t from, size_t to) if (!head) head = create_empty_buffers(folio, blocksize, 0); - block = (sector_t)folio->index << (PAGE_SHIFT - inode->i_blkbits); - for (bh = head, block_start = 0; bh != head || !block_start; - block++, block_start = block_end, bh = bh->b_this_page) { + block = folio_pos(folio) >> inode->i_blkbits; + block_end = 0; + bh = head; + do { + block_start = block_end; block_end = block_start + blocksize; if (block_end <= from || block_start >= to) { if (!buffer_uptodate(bh)) @@ -215,7 +217,8 @@ static int mext_page_mkuptodate(struct folio *folio, size_t from, size_t to) } ext4_read_bh_nowait(bh, 0, NULL); nr++; - } + } while (block++, (bh = bh->b_this_page) != head); + /* No io required */ if (!nr) goto out; |