Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9599b0e5 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

jbd2: Annotate transaction start also for jbd2_journal_restart() 



lockdep annotation for a transaction start has been at the end of
jbd2_journal_start(). But a transaction is also started from
jbd2_journal_restart(). Move the lockdep annotation to start_this_handle()
which covers both cases.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 553f9008

fs/jbd2/transaction.c

+3 −2
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ repeat_locked: 
		  __jbd2_log_space_left(journal));

	spin_unlock(&transaction->t_handle_lock);

	spin_unlock(&journal->j_state_lock);



	lock_map_acquire(&handle->h_lockdep_map);

out:

	if (unlikely(new_transaction))		/* It's usually NULL */

		kfree(new_transaction);
@@ -303,8 +305,6 @@ handle_t *jbd2_journal_start(journal_t *journal, int nblocks) 
		handle = ERR_PTR(err);

		goto out;

	}



	lock_map_acquire(&handle->h_lockdep_map);

out:

	return handle;

}
@@ -426,6 +426,7 @@ int jbd2_journal_restart(handle_t *handle, int nblocks) 
	__jbd2_log_start_commit(journal, transaction->t_tid);

	spin_unlock(&journal->j_state_lock);



	lock_map_release(&handle->h_lockdep_map);

	handle->h_buffer_credits = nblocks;

	ret = start_this_handle(journal, handle);

	return ret;