---

yaml --- r: 163647 b: refs/heads/master c: 9599b0e h: refs/heads/master i: 163645: 6a6655b 163643: f589278 163639: 6d055af 163631: fbbd0b7 163615: e4dc0bb 163583: cd25b0d v: v3
git-mirror · Aug 18, 2009 · 1a0cb8e · 1a0cb8e
1 parent 07e9be8
commit 1a0cb8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;