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>

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index f37d3c0e20535eacce542c7184f48d8b509884a2..c0d4797618ef4e1c2d14caf03a5f6b44ea0ecaa1 100644 (file)
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -1802,8 +1802,7 @@ try_again:
                        data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;
 
                credits = ocfs2_calc_extend_credits(inode->i_sb,
-                                                   &di->id2.i_list,
-                                                   clusters_to_alloc);
+                                                   &di->id2.i_list);
 
        }
 

diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index 30544ce8e9f78cc66cc0eb61387f84b21cef4309..93b079115edcf2e5c119311620aba53a4f7f3c92 100644 (file)
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -3284,7 +3284,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
                if (ocfs2_dir_resv_allowed(osb))
                        data_ac->ac_resv = &OCFS2_I(dir)->ip_la_data_resv;
 
-               credits = ocfs2_calc_extend_credits(sb, el, 1);
+               credits = ocfs2_calc_extend_credits(sb, el);
        } else {
                spin_unlock(&OCFS2_I(dir)->ip_lock);
                credits = OCFS2_SIMPLE_DIR_EXTEND_CREDITS;
@@ -3716,7 +3716,7 @@ static int ocfs2_dx_dir_rebalance_credits(struct ocfs2_super *osb,
 {
        int credits = ocfs2_clusters_to_blocks(osb->sb, 2);
 
-       credits += ocfs2_calc_extend_credits(osb->sb, &dx_root->dr_list, 1);
+       credits += ocfs2_calc_extend_credits(osb->sb, &dx_root->dr_list);
        credits += ocfs2_quota_trans_credits(osb->sb);
        return credits;
 }

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index d71903c6068b94f37836854762691a7a1c9d9f12..67c037af301a192b62e82947c9bc327ced0338e5 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -603,8 +603,7 @@ restart_all:
                goto leave;
        }
 
-       credits = ocfs2_calc_extend_credits(osb->sb, &fe->id2.i_list,
-                                           clusters_to_add);
+       credits = ocfs2_calc_extend_credits(osb->sb, &fe->id2.i_list);
        handle = ocfs2_start_trans(osb, credits);
        if (IS_ERR(handle)) {
                status = PTR_ERR(handle);

diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h
index 0b479bab36713ec3ef147c314fe2473b08ed1d9e..9ff4e8cf9d972857a79e07a628116084bc6ba506 100644 (file)
--- a/fs/ocfs2/journal.h
+++ b/fs/ocfs2/journal.h
@@ -524,8 +524,7 @@ static inline int ocfs2_calc_dxi_expand_credits(struct super_block *sb)
  * the result may be wrong.
  */
 static inline int ocfs2_calc_extend_credits(struct super_block *sb,
-                                           struct ocfs2_extent_list *root_el,
-                                           u32 bits_wanted)
+                                           struct ocfs2_extent_list *root_el)
 {
        int bitmap_blocks, sysfile_bitmap_blocks, extent_blocks;
 

diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c
index 3d3f3c83065ca3ed51d9dac690bac2e2012a36f9..445678d9163c257e9bbc398748b0556287a538ee 100644 (file)
--- a/fs/ocfs2/move_extents.c
+++ b/fs/ocfs2/move_extents.c
@@ -201,8 +201,7 @@ static int ocfs2_lock_allocators_move_extents(struct inode *inode,
                }
        }
 
-       *credits += ocfs2_calc_extend_credits(osb->sb, et->et_root_el,
-                                             clusters_to_move + 2);
+       *credits += ocfs2_calc_extend_credits(osb->sb, et->et_root_el);
 
        mlog(0, "reserve metadata_blocks: %d, data_clusters: %u, credits: %d\n",
             extra_blocks, clusters_to_move, *credits);

diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index bf4dfc14bb2c7cca75b618de73bfcaf656103ff2..0022192e7ac86499910c7b5a09e36b2b73758371 100644 (file)
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -2502,8 +2502,7 @@ static int ocfs2_calc_refcount_meta_credits(struct super_block *sb,
                ocfs2_init_refcount_extent_tree(&et, ci, ref_root_bh);
                *meta_add += ocfs2_extend_meta_needed(et.et_root_el);
                *credits += ocfs2_calc_extend_credits(sb,
-                                                     et.et_root_el,
-                                                     ref_blocks);
+                                                     et.et_root_el);
        } else {
                *credits += OCFS2_EXPAND_REFCOUNT_TREE_CREDITS;
                *meta_add += 1;
@@ -2874,8 +2873,7 @@ static int ocfs2_lock_refcount_allocators(struct super_block *sb,
                meta_add =
                        ocfs2_extend_meta_needed(et->et_root_el);
 
-       *credits += ocfs2_calc_extend_credits(sb, et->et_root_el,
-                                             num_clusters + 2);
+       *credits += ocfs2_calc_extend_credits(sb, et->et_root_el);
 
        ret = ocfs2_calc_refcount_meta_credits(sb, ref_ci, ref_root_bh,
                                               p_cluster, num_clusters,
@@ -3625,8 +3623,7 @@ int ocfs2_refcounted_xattr_delete_need(struct inode *inode,
 
                ocfs2_init_refcount_extent_tree(&et, ref_ci, ref_root_bh);
                *credits += ocfs2_calc_extend_credits(inode->i_sb,
-                                                     et.et_root_el,
-                                                     ref_blocks);
+                                                     et.et_root_el);
        }
 
 out:

diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 6ce0686eab7202b29cd9f29a39e6692b8a1d618a..aaaab8ba82aba36a55411ddeffdba1c99ff8c465 100644 (file)
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -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;
@@ -3040,8 +3039,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 +3104,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 +3129,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 +3175,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 +6211,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 +6776,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,