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

Commit e46f74dc authored by Joel Becker's avatar Joel Becker
Browse files

ocfs2: __ocfs2_rotate_tree_left() doesn't need struct inode. 



It already has struct ocfs2_extent_tree, which has the caching info.  So
we don't need to pass it struct inode.

Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 1e2dd63f

fs/ocfs2/alloc.c

+12 −12
Original line number Diff line number Diff line
@@ -2871,24 +2871,24 @@ static int ocfs2_rotate_rightmost_leaf_left(struct inode *inode, 
	return ret;

}



static int __ocfs2_rotate_tree_left(struct inode *inode,

				    handle_t *handle, int orig_credits,

static int __ocfs2_rotate_tree_left(handle_t *handle,

				    struct ocfs2_extent_tree *et,

				    int orig_credits,

				    struct ocfs2_path *path,

				    struct ocfs2_cached_dealloc_ctxt *dealloc,

				    struct ocfs2_path **empty_extent_path,

				    struct ocfs2_extent_tree *et)

				    struct ocfs2_path **empty_extent_path)

{

	int ret, subtree_root, deleted;

	u32 right_cpos;

	struct ocfs2_path *left_path = NULL;

	struct ocfs2_path *right_path = NULL;

	struct super_block *sb = ocfs2_metadata_cache_get_super(et->et_ci);



	BUG_ON(!ocfs2_is_empty_extent(&(path_leaf_el(path)->l_recs[0])));



	*empty_extent_path = NULL;



	ret = ocfs2_find_cpos_for_right_leaf(inode->i_sb, path,

					     &right_cpos);

	ret = ocfs2_find_cpos_for_right_leaf(sb, path, &right_cpos);

	if (ret) {

		mlog_errno(ret);

		goto out;
@@ -2937,7 +2937,7 @@ static int __ocfs2_rotate_tree_left(struct inode *inode, 
		 * Caller might still want to make changes to the

		 * tree root, so re-add it to the journal here.

		 */

		ret = ocfs2_path_bh_journal_access(handle, INODE_CACHE(inode),

		ret = ocfs2_path_bh_journal_access(handle, et->et_ci,

						   left_path, 0);

		if (ret) {

			mlog_errno(ret);
@@ -2973,7 +2973,7 @@ static int __ocfs2_rotate_tree_left(struct inode *inode, 


		ocfs2_mv_path(left_path, right_path);



		ret = ocfs2_find_cpos_for_right_leaf(inode->i_sb, left_path,

		ret = ocfs2_find_cpos_for_right_leaf(sb, left_path,

						     &right_cpos);

		if (ret) {

			mlog_errno(ret);
@@ -3187,8 +3187,8 @@ static int ocfs2_rotate_tree_left(struct inode *inode, handle_t *handle, 
	 * and restarting from there.

	 */

try_rotate:

	ret = __ocfs2_rotate_tree_left(inode, handle, orig_credits, path,

				       dealloc, &restart_path, et);

	ret = __ocfs2_rotate_tree_left(handle, et, orig_credits, path,

				       dealloc, &restart_path);

	if (ret && ret != -EAGAIN) {

		mlog_errno(ret);

		goto out;
@@ -3198,9 +3198,9 @@ static int ocfs2_rotate_tree_left(struct inode *inode, handle_t *handle, 
		tmp_path = restart_path;

		restart_path = NULL;



		ret = __ocfs2_rotate_tree_left(inode, handle, orig_credits,

		ret = __ocfs2_rotate_tree_left(handle, et, orig_credits,

					       tmp_path, dealloc,

					       &restart_path, et);

					       &restart_path);

		if (ret && ret != -EAGAIN) {

			mlog_errno(ret);

			goto out;