]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
fs/ext4: use sleeping version of sb_find_get_block()
authorDavidlohr Bueso <dave@stgolabs.net>
Fri, 18 Apr 2025 01:59:20 +0000 (18:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 May 2025 09:12:21 +0000 (11:12 +0200)
[ Upstream commit 6e8f57fd09c9fb569d10b2ccc3878155b702591a ]

Enable ext4_free_blocks() to use it, which has a cond_resched to begin
with. Convert to the new nonatomic flavor to benefit from potential
performance benefits and adapt in the future vs migration such that
semantics are kept.

Suggested-by: Jan Kara <jack@suse.cz>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>
Link: https://kdevops.org/ext4/v6.15-rc2.html
Link: https://lore.kernel.org/all/aAAEvcrmREWa1SKF@bombadil.infradead.org/
Link: https://lore.kernel.org/20250418015921.132400-7-dave@stgolabs.net
Tested-by: kdevops@lists.linux.dev
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/ext4/mballoc.c

index b25a27c8669692f5b62012b84715a7b320527743..d6f1e61c6dc820ee58c92af3c88108d332d541eb 100644 (file)
@@ -6644,7 +6644,8 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,
                for (i = 0; i < count; i++) {
                        cond_resched();
                        if (is_metadata)
-                               bh = sb_find_get_block(inode->i_sb, block + i);
+                               bh = sb_find_get_block_nonatomic(inode->i_sb,
+                                                                block + i);
                        ext4_forget(handle, is_metadata, inode, bh, block + i);
                }
        }