From 1a0cb8e2c0f7516813838bcedac8133de69b7104 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Mon, 17 Aug 2009 21:23:17 -0400
Subject: [PATCH] --- yaml --- r: 163647 b: refs/heads/master c:
 9599b0e597d810be9b8f759ea6e9619c4f983c5e h: refs/heads/master i:   163645:
 6a6655baa4053f4955316deff6c45db9e3a0212f   163643:
 f58927837fdb8497e9da2a1c8ada8441f16ee07c   163639:
 6d055af18468bf51fce3cb323785d95936a98cc5   163631:
 fbbd0b74d1e9d544c85e414f516eb640633c730a   163615:
 e4dc0bb05e20baf71e64463eadeea4d95fbf4196   163583:
 cd25b0dee166c2efe35166f5ef229e5705d940ad v: v3

---
 [refs]                      | 2 +-
 trunk/fs/jbd2/transaction.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d46629de3af4..a4ad1b8e0758 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 553f9008939638335836eec834f4dea310c17eae
+refs/heads/master: 9599b0e597d810be9b8f759ea6e9619c4f983c5e
diff --git a/trunk/fs/jbd2/transaction.c b/trunk/fs/jbd2/transaction.c
index 4516a87ca55c..a0512700542f 100644
--- a/trunk/fs/jbd2/transaction.c
+++ b/trunk/fs/jbd2/transaction.c
@@ -238,6 +238,8 @@ static int start_this_handle(journal_t *journal, handle_t *handle)
 		  __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;