Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06f9da6e authored by Goldwyn Rodrigues's avatar Goldwyn Rodrigues Committed by Linus Torvalds
Browse files

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: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 59c36455

fs/ocfs2/aops.c

+1 −2
Original line number Diff line number Diff line
@@ -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);



	}

fs/ocfs2/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

fs/ocfs2/file.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

fs/ocfs2/journal.h

+1 −2
Original line number Diff line number Diff line
@@ -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;

fs/ocfs2/move_extents.c

+1 −2
Original line number Diff line number Diff line
@@ -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);