2 files changed, 31 insertions, 31 deletions

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 4a231a166cf8..1ef547e49373 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -1481,8 +1481,16 @@ static int ocfs2_write_begin_inline(struct address_space *mapping,
         handle_t *handle;
         struct ocfs2_dinode *di = (struct ocfs2_dinode *)wc->w_di_bh->b_data;
 
+        handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
+        if (IS_ERR(handle)) {
+                ret = PTR_ERR(handle);
+                mlog_errno(ret);
+                goto out;
+        }
+
         page = find_or_create_page(mapping, 0, GFP_NOFS);
         if (!page) {
+                ocfs2_commit_trans(osb, handle);
                 ret = -ENOMEM;
                 mlog_errno(ret);
                 goto out;
@@ -1494,13 +1502,6 @@ static int ocfs2_write_begin_inline(struct address_space *mapping,
         wc->w_pages[0] = wc->w_target_page = page;
         wc->w_num_pages = 1;
 
-        handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
-        if (IS_ERR(handle)) {
-                ret = PTR_ERR(handle);
-                mlog_errno(ret);
-                goto out;
-        }
-
         ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh,
                                       OCFS2_JOURNAL_ACCESS_WRITE);
         if (ret) {
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 2930e231f3f9..682732f3f0d8 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -760,7 +760,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
         struct address_space *mapping = inode->i_mapping;
         struct page *page;
         unsigned long index = abs_from >> PAGE_CACHE_SHIFT;
-        handle_t *handle = NULL;
+        handle_t *handle;
         int ret = 0;
         unsigned zero_from, zero_to, block_start, block_end;
         struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
@@ -769,11 +769,17 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
         BUG_ON(abs_to > (((u64)index + 1) << PAGE_CACHE_SHIFT));
         BUG_ON(abs_from & (inode->i_blkbits - 1));
 
+        handle = ocfs2_zero_start_ordered_transaction(inode, di_bh);
+        if (IS_ERR(handle)) {
+                ret = PTR_ERR(handle);
+                goto out;
+        }
+
         page = find_or_create_page(mapping, index, GFP_NOFS);
         if (!page) {
                 ret = -ENOMEM;
                 mlog_errno(ret);
-                goto out;
+                goto out_commit_trans;
         }
 
         /* Get the offsets within the page that we want to zero */
@@ -805,15 +811,6 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
                         goto out_unlock;
                 }
 
-                if (!handle) {
-                        handle = ocfs2_zero_start_ordered_transaction(inode,
-                                                                      di_bh);
-                        if (IS_ERR(handle)) {
-                                ret = PTR_ERR(handle);
-                                handle = NULL;
-                                break;
-                        }
-                }
 
                 /* must not update i_size! */
                 ret = block_commit_write(page, block_start + 1,
@@ -824,27 +821,29 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
                         ret = 0;
         }
 
+        /*
+         * fs-writeback will release the dirty pages without page lock
+         * whose offset are over inode size, the release happens at
+         * block_write_full_page().
+         */
+        i_size_write(inode, abs_to);
+        inode->i_blocks = ocfs2_inode_sector_count(inode);
+        di->i_size = cpu_to_le64((u64)i_size_read(inode));
+        inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+        di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec);
+        di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);
+        di->i_mtime_nsec = di->i_ctime_nsec;
         if (handle) {
-                /*
-                 * fs-writeback will release the dirty pages without page lock
-                 * whose offset are over inode size, the release happens at
-                 * block_write_full_page().
-                 */
-                i_size_write(inode, abs_to);
-                inode->i_blocks = ocfs2_inode_sector_count(inode);
-                di->i_size = cpu_to_le64((u64)i_size_read(inode));
-                inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-                di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec);
-                di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);
-                di->i_mtime_nsec = di->i_ctime_nsec;
                 ocfs2_journal_dirty(handle, di_bh);
                 ocfs2_update_inode_fsync_trans(handle, inode, 1);
-                ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
         }
 
 out_unlock:
         unlock_page(page);
         page_cache_release(page);
+out_commit_trans:
+        if (handle)
+                ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
 out:
         return ret;
 }