Unverified Commit a0b5ff07 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Christian Brauner
Browse files

fs/ocfs2: use sleeping version of __find_get_block() 



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: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Link: https://kdevops.org/ext4/v6.15-rc2.html # [0]
Link: https://lore.kernel.org/all/aAAEvcrmREWa1SKF@bombadil.infradead.org/ # [1]
Link: https://lore.kernel.org/20250418015921.132400-5-dave@stgolabs.net


Tested-by: default avatar <kdevops@lists.linux.dev>
Reviewed-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 5b67d439

fs/ocfs2/journal.c

+1 −1
Original line number Diff line number Diff line
@@ -1249,7 +1249,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)