1 files changed, 14 insertions, 14 deletions

diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 6ce0686eab72..f0a1326d9bba 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -377,7 +377,7 @@ static int ocfs2_init_xattr_bucket(struct ocfs2_xattr_bucket *bucket,
                 bucket->bu_bhs[i] = sb_getblk(bucket->bu_inode->i_sb,
                                               xb_blkno + i);
                 if (!bucket->bu_bhs[i]) {
-                        rc = -EIO;
+                        rc = -ENOMEM;
                         mlog_errno(rc);
                         break;
                 }
@@ -754,8 +754,7 @@ static int ocfs2_xattr_extend_allocation(struct inode *inode,
                         BUG_ON(why == RESTART_META);
 
                         credits = ocfs2_calc_extend_credits(inode->i_sb,
-                                                            &vb->vb_xv->xr_list,
-                                                            clusters_to_add);
+                                                            &vb->vb_xv->xr_list);
                         status = ocfs2_extend_trans(handle, credits);
                         if (status < 0) {
                                 status = -ENOMEM;
@@ -2865,6 +2864,12 @@ static int ocfs2_create_xattr_block(struct inode *inode,
         }
 
         new_bh = sb_getblk(inode->i_sb, first_blkno);
+        if (!new_bh) {
+                ret = -ENOMEM;
+                mlog_errno(ret);
+                goto end;
+        }
+
         ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode), new_bh);
 
         ret = ocfs2_journal_access_xb(ctxt->handle, INODE_CACHE(inode),
@@ -3040,8 +3045,7 @@ static int ocfs2_calc_xattr_set_need(struct inode *inode,
                 if (xi->xi_value_len > OCFS2_XATTR_INLINE_SIZE) {
                         clusters_add += new_clusters;
                         credits += ocfs2_calc_extend_credits(inode->i_sb,
-                                                        &def_xv.xv.xr_list,
-                                                        new_clusters);
+                                                        &def_xv.xv.xr_list);
                 }
 
                 goto meta_guess;
@@ -3106,8 +3110,7 @@ static int ocfs2_calc_xattr_set_need(struct inode *inode,
                         if (!ocfs2_xattr_is_local(xe))
                                 credits += ocfs2_calc_extend_credits(
                                                         inode->i_sb,
-                                                        &def_xv.xv.xr_list,
-                                                        new_clusters);
+                                                        &def_xv.xv.xr_list);
                         goto out;
                 }
         }
@@ -3132,9 +3135,7 @@ static int ocfs2_calc_xattr_set_need(struct inode *inode,
                         meta_add += ocfs2_extend_meta_needed(&xv->xr_list);
                         clusters_add += new_clusters - old_clusters;
                         credits += ocfs2_calc_extend_credits(inode->i_sb,
-                                                             &xv->xr_list,
-                                                             new_clusters -
-                                                             old_clusters);
+                                                             &xv->xr_list);
                         if (value_size >= OCFS2_XATTR_ROOT_SIZE)
                                 goto out;
                 }
@@ -3180,7 +3181,7 @@ meta_guess:
                                  &xb->xb_attrs.xb_root.xt_list;
                         meta_add += ocfs2_extend_meta_needed(el);
                         credits += ocfs2_calc_extend_credits(inode->i_sb,
-                                                             el, 1);
+                                                             el);
                 } else
                         credits += OCFS2_SUBALLOC_ALLOC + 1;
 
@@ -6216,8 +6217,7 @@ static int ocfs2_value_metas_in_xattr_header(struct super_block *sb,
                           le16_to_cpu(xv->xr_list.l_next_free_rec);
 
                 *credits += ocfs2_calc_extend_credits(sb,
-                                                &def_xv.xv.xr_list,
-                                                le32_to_cpu(xv->xr_clusters));
+                                                &def_xv.xv.xr_list);
 
                 /*
                  * If the value is a tree with depth > 1, We don't go deep
@@ -6782,7 +6782,7 @@ static int ocfs2_lock_reflink_xattr_rec_allocators(
                 metas.num_metas += ocfs2_extend_meta_needed(xt_et->et_root_el);
 
         *credits += ocfs2_calc_extend_credits(osb->sb,
-                                              xt_et->et_root_el, len);
+                                              xt_et->et_root_el);
 
         if (metas.num_metas) {
                 ret = ocfs2_reserve_new_metadata_blocks(osb, metas.num_metas,