move-lockdep-instrumentation-for-jbd2-handles

   1 jbd2: move lockdep instrumentation for jbd2 handles
   2
   3 From: Jan Kara <jack@suse.cz>
   4
   5 The transaction the handle references is free to commit once we've
   6 decremented t_updates counter. Move the lockdep instrumentation to that
   7 place. Currently it was a bit later which did not really matter but
   8 subsequent improvements to lockdep instrumentation would cause false
   9 positives with it.
  10
  11 Signed-off-by: Jan Kara <jack@suse.cz>
  12 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  13 ---
  14  fs/jbd2/transaction.c | 4 ++--
  15  1 file changed, 2 insertions(+), 2 deletions(-)
  16
  17 diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
  18 index 1749519b362f..41249538c047 100644
  19 --- a/fs/jbd2/transaction.c
  20 +++ b/fs/jbd2/transaction.c
  21 @@ -1750,11 +1750,11 @@ int jbd2_journal_stop(handle_t *handle)
  22                         wake_up(&journal->j_wait_transaction_locked);
  23         }
  24
  25 +       lock_map_release(&handle->h_lockdep_map);
  26 +
  27         if (wait_for_commit)
  28                 err = jbd2_log_wait_commit(journal, tid);
  29
  30 -       lock_map_release(&handle->h_lockdep_map);
  31 -
  32         if (handle->h_rsv_handle)
  33                 jbd2_journal_free_reserved(handle->h_rsv_handle);
  34  free_and_exit:
  35 --
  36 2.6.6
  37
  38