aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/xattr.c
diff options
context:
space:
mode:
authorGoldwyn Rodrigues <rgoldwyn@suse.de>2013-11-12 18:06:52 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-12 22:09:00 -0500
commit06f9da6e826a0b459652b98a21541bca274bd440 (patch)
tree6fe8423a67c3c50e664b43ea0d772b09e63e5849 /fs/ocfs2/xattr.c
parent59c36455d061e200f386e1817362f6afd6265b6a (diff)
fs/ocfs2: remove unnecessary variable bits_wanted from ocfs2_calc_extend_credits
Code cleanup to remove unnecessary variable passed but never used to ocfs2_calc_extend_credits. Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Mark Fasheh <mfasheh@suse.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2/xattr.c')
-rw-r--r--fs/ocfs2/xattr.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 6ce0686eab72..aaaab8ba82ab 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -754,8 +754,7 @@ static int ocfs2_xattr_extend_allocation(struct inode *inode,
754 BUG_ON(why == RESTART_META); 754 BUG_ON(why == RESTART_META);
755 755
756 credits = ocfs2_calc_extend_credits(inode->i_sb, 756 credits = ocfs2_calc_extend_credits(inode->i_sb,
757 &vb->vb_xv->xr_list, 757 &vb->vb_xv->xr_list);
758 clusters_to_add);
759 status = ocfs2_extend_trans(handle, credits); 758 status = ocfs2_extend_trans(handle, credits);
760 if (status < 0) { 759 if (status < 0) {
761 status = -ENOMEM; 760 status = -ENOMEM;
@@ -3040,8 +3039,7 @@ static int ocfs2_calc_xattr_set_need(struct inode *inode,
3040 if (xi->xi_value_len > OCFS2_XATTR_INLINE_SIZE) { 3039 if (xi->xi_value_len > OCFS2_XATTR_INLINE_SIZE) {
3041 clusters_add += new_clusters; 3040 clusters_add += new_clusters;
3042 credits += ocfs2_calc_extend_credits(inode->i_sb, 3041 credits += ocfs2_calc_extend_credits(inode->i_sb,
3043 &def_xv.xv.xr_list, 3042 &def_xv.xv.xr_list);
3044 new_clusters);
3045 } 3043 }
3046 3044
3047 goto meta_guess; 3045 goto meta_guess;
@@ -3106,8 +3104,7 @@ static int ocfs2_calc_xattr_set_need(struct inode *inode,
3106 if (!ocfs2_xattr_is_local(xe)) 3104 if (!ocfs2_xattr_is_local(xe))
3107 credits += ocfs2_calc_extend_credits( 3105 credits += ocfs2_calc_extend_credits(
3108 inode->i_sb, 3106 inode->i_sb,
3109 &def_xv.xv.xr_list, 3107 &def_xv.xv.xr_list);
3110 new_clusters);
3111 goto out; 3108 goto out;
3112 } 3109 }
3113 } 3110 }
@@ -3132,9 +3129,7 @@ static int ocfs2_calc_xattr_set_need(struct inode *inode,
3132 meta_add += ocfs2_extend_meta_needed(&xv->xr_list); 3129 meta_add += ocfs2_extend_meta_needed(&xv->xr_list);
3133 clusters_add += new_clusters - old_clusters; 3130 clusters_add += new_clusters - old_clusters;
3134 credits += ocfs2_calc_extend_credits(inode->i_sb, 3131 credits += ocfs2_calc_extend_credits(inode->i_sb,
3135 &xv->xr_list, 3132 &xv->xr_list);
3136 new_clusters -
3137 old_clusters);
3138 if (value_size >= OCFS2_XATTR_ROOT_SIZE) 3133 if (value_size >= OCFS2_XATTR_ROOT_SIZE)
3139 goto out; 3134 goto out;
3140 } 3135 }
@@ -3180,7 +3175,7 @@ meta_guess:
3180 &xb->xb_attrs.xb_root.xt_list; 3175 &xb->xb_attrs.xb_root.xt_list;
3181 meta_add += ocfs2_extend_meta_needed(el); 3176 meta_add += ocfs2_extend_meta_needed(el);
3182 credits += ocfs2_calc_extend_credits(inode->i_sb, 3177 credits += ocfs2_calc_extend_credits(inode->i_sb,
3183 el, 1); 3178 el);
3184 } else 3179 } else
3185 credits += OCFS2_SUBALLOC_ALLOC + 1; 3180 credits += OCFS2_SUBALLOC_ALLOC + 1;
3186 3181
@@ -6216,8 +6211,7 @@ static int ocfs2_value_metas_in_xattr_header(struct super_block *sb,
6216 le16_to_cpu(xv->xr_list.l_next_free_rec); 6211 le16_to_cpu(xv->xr_list.l_next_free_rec);
6217 6212
6218 *credits += ocfs2_calc_extend_credits(sb, 6213 *credits += ocfs2_calc_extend_credits(sb,
6219 &def_xv.xv.xr_list, 6214 &def_xv.xv.xr_list);
6220 le32_to_cpu(xv->xr_clusters));
6221 6215
6222 /* 6216 /*
6223 * If the value is a tree with depth > 1, We don't go deep 6217 * If the value is a tree with depth > 1, We don't go deep
@@ -6782,7 +6776,7 @@ static int ocfs2_lock_reflink_xattr_rec_allocators(
6782 metas.num_metas += ocfs2_extend_meta_needed(xt_et->et_root_el); 6776 metas.num_metas += ocfs2_extend_meta_needed(xt_et->et_root_el);
6783 6777
6784 *credits += ocfs2_calc_extend_credits(osb->sb, 6778 *credits += ocfs2_calc_extend_credits(osb->sb,
6785 xt_et->et_root_el, len); 6779 xt_et->et_root_el);
6786 6780
6787 if (metas.num_metas) { 6781 if (metas.num_metas) {
6788 ret = ocfs2_reserve_new_metadata_blocks(osb, metas.num_metas, 6782 ret = ocfs2_reserve_new_metadata_blocks(osb, metas.num_metas,