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);