fs/ocfs2: use sleeping version of __find_get_block()

[ Upstream commit a0b5ff07491010789fcb012bc8f9dad9d26f9a8b ]

This is a path that allows for blocking as it does IO. 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-5-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>

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index f37831d5f95a19ce5aa06e44c8374a416cc8a65c..e5f58ff2175f4161d7fead9bb9b095dc6c1abfef 100644 (file)
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -1271,7 +1271,7 @@ static int ocfs2_force_read_journal(struct inode *inode)
                }
 
                for (i = 0; i < p_blocks; i++, p_blkno++) {
-                       bh = __find_get_block(osb->sb->s_bdev, p_blkno,
+                       bh = __find_get_block_nonatomic(osb->sb->s_bdev, p_blkno,
                                        osb->sb->s_blocksize);
                        /* block not cached. */
                        if (!bh)