Skip to content

Commit

Permalink
jbd2: move lockdep instrumentation for jbd2 handles
Browse files Browse the repository at this point in the history
The transaction the handle references is free to commit once we've
decremented t_updates counter. Move the lockdep instrumentation to that
place. Currently it was a bit later which did not really matter but
subsequent improvements to lockdep instrumentation would cause false
positives with it.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  • Loading branch information
jankara authored and tytso committed Jun 30, 2016
1 parent 78d9625 commit 7a4b188
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fs/jbd2/transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -1750,11 +1750,11 @@ int jbd2_journal_stop(handle_t *handle)
wake_up(&journal->j_wait_transaction_locked);
}

lock_map_release(&handle->h_lockdep_map);

if (wait_for_commit)
err = jbd2_log_wait_commit(journal, tid);

lock_map_release(&handle->h_lockdep_map);

if (handle->h_rsv_handle)
jbd2_journal_free_reserved(handle->h_rsv_handle);
free_and_exit:
Expand Down

0 comments on commit 7a4b188

Please sign in to comment.