Merge with /home/shaggy/git/linus-clean/

1 files changed, 3 insertions, 1 deletions

diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 5d9b00e28837..8824e84f8a56 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -1384,8 +1384,10 @@ static int ext3_journalled_writepage(struct page *page,
                 ClearPageChecked(page);
                 ret = block_prepare_write(page, 0, PAGE_CACHE_SIZE,
                                         ext3_get_block);
-                if (ret != 0)
+                if (ret != 0) {
+                        ext3_journal_stop(handle);
                         goto out_unlock;
+                }
                 ret = walk_page_buffers(handle, page_buffers(page), 0,
                         PAGE_CACHE_SIZE, NULL, do_journal_get_write_access);