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

Commit 3adae9da authored by Jan Kara's avatar Jan Kara
Browse files

jbd: Annotate transaction start also for journal_restart() 



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

Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 9c28cbcc

fs/jbd/transaction.c

+3 −3
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ static int start_this_handle(journal_t *journal, handle_t *handle) 
		  __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);
@@ -293,9 +295,6 @@ handle_t *journal_start(journal_t *journal, int nblocks) 
		handle = ERR_PTR(err);

		goto out;

	}



	lock_map_acquire(&handle->h_lockdep_map);



out:

	return handle;

}
@@ -417,6 +416,7 @@ int journal_restart(handle_t *handle, int nblocks) 
	__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;