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

fs/jbd2: use sleeping version of __find_get_block() 



Convert to the new nonatomic flavor to benefit from potential
performance benefits and adapt in the future vs migration such
that semantics are kept.

- jbd2_journal_revoke(): can sleep (has might_sleep() in the beginning)

- jbd2_journal_cancel_revoke(): only used from do_get_write_access() and
    do_get_create_access() which do sleep. So can sleep.

- jbd2_clear_buffer_revoked_flags() - only called from journal commit code
    which sleeps. So can sleep.

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-6-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 a0b5ff07

fs/jbd2/revoke.c

+9 −6
Original line number Diff line number Diff line
@@ -345,7 +345,8 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr, 
	bh = bh_in;



	if (!bh) {

		bh = __find_get_block(bdev, blocknr, journal->j_blocksize);

		bh = __find_get_block_nonatomic(bdev, blocknr,

						journal->j_blocksize);

		if (bh)

			BUFFER_TRACE(bh, "found on hash");

	}
@@ -355,7 +356,8 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr, 


		/* If there is a different buffer_head lying around in

		 * memory anywhere... */

		bh2 = __find_get_block(bdev, blocknr, journal->j_blocksize);

		bh2 = __find_get_block_nonatomic(bdev, blocknr,

						 journal->j_blocksize);

		if (bh2) {

			/* ... and it has RevokeValid status... */

			if (bh2 != bh && buffer_revokevalid(bh2))
@@ -464,7 +466,8 @@ void jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh) 
	 * state machine will get very upset later on. */

	if (need_cancel) {

		struct buffer_head *bh2;

		bh2 = __find_get_block(bh->b_bdev, bh->b_blocknr, bh->b_size);

		bh2 = __find_get_block_nonatomic(bh->b_bdev, bh->b_blocknr,

						 bh->b_size);

		if (bh2) {

			if (bh2 != bh)

				clear_buffer_revoked(bh2);
@@ -492,7 +495,7 @@ void jbd2_clear_buffer_revoked_flags(journal_t *journal) 
			struct jbd2_revoke_record_s *record;

			struct buffer_head *bh;

			record = (struct jbd2_revoke_record_s *)list_entry;

			bh = __find_get_block(journal->j_fs_dev,

			bh = __find_get_block_nonatomic(journal->j_fs_dev,

							record->blocknr,

							journal->j_blocksize);

			if (bh) {