1 files changed, 9 insertions, 9 deletions

diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 6db68a23a296..df53a2ce2de5 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -5094,30 +5094,30 @@ static int ocfs2_delete_xattr_in_bucket(struct inode *inode,
 
         ocfs2_init_dealloc_ctxt(&ctxt.dealloc);
 
-        ctxt.handle = ocfs2_start_trans(osb, credits);
-        if (IS_ERR(ctxt.handle)) {
-                ret = PTR_ERR(ctxt.handle);
-                mlog_errno(ret);
-                goto out;
-        }
-
         for (i = 0; i < le16_to_cpu(xh->xh_count); i++) {
                 xe = &xh->xh_entries[i];
                 if (ocfs2_xattr_is_local(xe))
                         continue;
 
+                ctxt.handle = ocfs2_start_trans(osb, credits);
+                if (IS_ERR(ctxt.handle)) {
+                        ret = PTR_ERR(ctxt.handle);
+                        mlog_errno(ret);
+                        break;
+                }
+
                 ret = ocfs2_xattr_bucket_value_truncate(inode, bucket,
                                                         i, 0, &ctxt);
+
+                ocfs2_commit_trans(osb, ctxt.handle);
                 if (ret) {
                         mlog_errno(ret);
                         break;
                 }
         }
 
-        ret = ocfs2_commit_trans(osb, ctxt.handle);
         ocfs2_schedule_truncate_log_flush(osb, 1);
         ocfs2_run_deallocs(osb, &ctxt.dealloc);
-out:
         return ret;
 }