---

yaml --- r: 166595 b: refs/heads/master c: f3dc272 h: refs/heads/master i: 166593: 52e0bf0 166591: d1d6d78 v: v3
git-mirror · Sep 29, 2009 · 02b8665 · 02b8665
1 parent 02b991d
commit 02b8665
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 830156c79b0a99ddf0f62496bcf4de640f9f52cd
+refs/heads/master: f3dc272fd5e2ae08244796bb39e7e1ce4b25d3b3
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
@@ -5615,24 +5615,13 @@ void ext4_dirty_inode(struct inode *inode)
 	handle_t *current_handle = ext4_journal_current_handle();
 	handle_t *handle;
 
-	if (!ext4_handle_valid(current_handle)) {
-		ext4_mark_inode_dirty(current_handle, inode);
-		return;
-	}
-
 	handle = ext4_journal_start(inode, 2);
 	if (IS_ERR(handle))
 		goto out;
-	if (current_handle &&
-		current_handle->h_transaction != handle->h_transaction) {
-		/* This task has a transaction open against a different fs */
-		printk(KERN_EMERG "%s: transactions do not match!\n",
-		       __func__);
-	} else {
-		jbd_debug(5, "marking dirty.  outer handle=%p\n",
-				current_handle);
-		ext4_mark_inode_dirty(handle, inode);
-	}
+
+	jbd_debug(5, "marking dirty.  outer handle=%p\n", current_handle);
+	ext4_mark_inode_dirty(handle, inode);
+
 	ext4_journal_stop(handle);
 out:
 	return;