diff options
Diffstat (limited to 'fs/jbd')
-rw-r--r-- | fs/jbd/transaction.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 833c1675a00c..006f9ad838a2 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -229,6 +229,8 @@ repeat_locked: | |||
229 | __log_space_left(journal)); | 229 | __log_space_left(journal)); |
230 | spin_unlock(&transaction->t_handle_lock); | 230 | spin_unlock(&transaction->t_handle_lock); |
231 | spin_unlock(&journal->j_state_lock); | 231 | spin_unlock(&journal->j_state_lock); |
232 | |||
233 | lock_map_acquire(&handle->h_lockdep_map); | ||
232 | out: | 234 | out: |
233 | if (unlikely(new_transaction)) /* It's usually NULL */ | 235 | if (unlikely(new_transaction)) /* It's usually NULL */ |
234 | kfree(new_transaction); | 236 | kfree(new_transaction); |
@@ -293,9 +295,6 @@ handle_t *journal_start(journal_t *journal, int nblocks) | |||
293 | handle = ERR_PTR(err); | 295 | handle = ERR_PTR(err); |
294 | goto out; | 296 | goto out; |
295 | } | 297 | } |
296 | |||
297 | lock_map_acquire(&handle->h_lockdep_map); | ||
298 | |||
299 | out: | 298 | out: |
300 | return handle; | 299 | return handle; |
301 | } | 300 | } |
@@ -417,6 +416,7 @@ int journal_restart(handle_t *handle, int nblocks) | |||
417 | __log_start_commit(journal, transaction->t_tid); | 416 | __log_start_commit(journal, transaction->t_tid); |
418 | spin_unlock(&journal->j_state_lock); | 417 | spin_unlock(&journal->j_state_lock); |
419 | 418 | ||
419 | lock_map_release(&handle->h_lockdep_map); | ||
420 | handle->h_buffer_credits = nblocks; | 420 | handle->h_buffer_credits = nblocks; |
421 | ret = start_this_handle(journal, handle); | 421 | ret = start_this_handle(journal, handle); |
422 | return ret; | 422 | return ret; |