From 44f4cc9c2e593819435720b36023d71e7b69944d Mon Sep 17 00:00:00 2001
From: Yongqiang Yang <xiaoqiangnk@gmail.com>
Date: Wed, 26 Oct 2011 05:00:19 -0400
Subject: [PATCH] --- yaml --- r: 273157 b: refs/heads/master c:
 fcbb5515825f1bb20b7a6f75ec48bee61416f879 h: refs/heads/master i:   273155:
 31695e123c373e7171c57d54b6063d2b1b4d234b v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/inode.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7f08e2888f0f..bcddbe2a82a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f8ff537266ee5396c920fb0c842a21df3055ff3
+refs/heads/master: fcbb5515825f1bb20b7a6f75ec48bee61416f879
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 87ec615f0fd6..e4b26faac5ff 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -4791,6 +4791,7 @@ int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 			  PAGE_CACHE_SIZE, NULL, do_journal_get_write_access)) {
 			unlock_page(page);
 			ret = VM_FAULT_SIGBUS;
+			ext4_journal_stop(handle);
 			goto out;
 		}
 		ext4_set_inode_state(inode, EXT4_STATE_JDATA);