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

Commit d6a0a126 authored by Tsutomu Itoh's avatar Tsutomu Itoh Committed by Josef Bacik
Browse files

Btrfs: remove unused argument of fixup_low_keys() 



Argument 'trans' is not used in fixup_low_keys(). So, remove it.

Signed-off-by: default avatarTsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent b4fcd6be

fs/btrfs/ctree.c

+8 −10
Original line number Original line Diff line number Diff line
@@ -2905,8 +2905,7 @@ int btrfs_search_slot_for_read(struct btrfs_root *root, 
 * higher levels

 * higher levels

 *

 *

 */

 */

static void fixup_low_keys(struct btrfs_trans_handle *trans,

static void fixup_low_keys(struct btrfs_root *root, struct btrfs_path *path,

			   struct btrfs_root *root, struct btrfs_path *path,

			   struct btrfs_disk_key *key, int level)

			   struct btrfs_disk_key *key, int level)

{

{

	int i;

	int i;
@@ -2954,7 +2953,7 @@ void btrfs_set_item_key_safe(struct btrfs_trans_handle *trans, 
	btrfs_set_item_key(eb, &disk_key, slot);

	btrfs_set_item_key(eb, &disk_key, slot);

	btrfs_mark_buffer_dirty(eb);

	btrfs_mark_buffer_dirty(eb);

	if (slot == 0)

	if (slot == 0)

		fixup_low_keys(trans, root, path, &disk_key, 1);

		fixup_low_keys(root, path, &disk_key, 1);

}

}





/*

/*
@@ -3692,7 +3691,7 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans, 
		clean_tree_block(trans, root, right);

		clean_tree_block(trans, root, right);





	btrfs_item_key(right, &disk_key, 0);

	btrfs_item_key(right, &disk_key, 0);

	fixup_low_keys(trans, root, path, &disk_key, 1);

	fixup_low_keys(root, path, &disk_key, 1);





	/* then fixup the leaf pointer in the path */

	/* then fixup the leaf pointer in the path */

	if (path->slots[0] < push_items) {

	if (path->slots[0] < push_items) {
@@ -4052,8 +4051,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans, 
			path->nodes[0] = right;

			path->nodes[0] = right;

			path->slots[0] = 0;

			path->slots[0] = 0;

			if (path->slots[1] == 0)

			if (path->slots[1] == 0)

				fixup_low_keys(trans, root, path,

				fixup_low_keys(root, path, &disk_key, 1);

					       &disk_key, 1);

		}

		}

		btrfs_mark_buffer_dirty(right);

		btrfs_mark_buffer_dirty(right);

		return ret;

		return ret;
@@ -4372,7 +4370,7 @@ void btrfs_truncate_item(struct btrfs_trans_handle *trans, 
		btrfs_set_disk_key_offset(&disk_key, offset + size_diff);

		btrfs_set_disk_key_offset(&disk_key, offset + size_diff);

		btrfs_set_item_key(leaf, &disk_key, slot);

		btrfs_set_item_key(leaf, &disk_key, slot);

		if (slot == 0)

		if (slot == 0)

			fixup_low_keys(trans, root, path, &disk_key, 1);

			fixup_low_keys(root, path, &disk_key, 1);

	}

	}





	item = btrfs_item_nr(leaf, slot);

	item = btrfs_item_nr(leaf, slot);
@@ -4536,7 +4534,7 @@ void setup_items_for_insert(struct btrfs_trans_handle *trans, 




	if (slot == 0) {

	if (slot == 0) {

		btrfs_cpu_key_to_disk(&disk_key, cpu_key);

		btrfs_cpu_key_to_disk(&disk_key, cpu_key);

		fixup_low_keys(trans, root, path, &disk_key, 1);

		fixup_low_keys(root, path, &disk_key, 1);

	}

	}

	btrfs_unlock_up_safe(path, 1);

	btrfs_unlock_up_safe(path, 1);

	btrfs_mark_buffer_dirty(leaf);

	btrfs_mark_buffer_dirty(leaf);
@@ -4647,7 +4645,7 @@ static void del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
		struct btrfs_disk_key disk_key;

		struct btrfs_disk_key disk_key;





		btrfs_node_key(parent, &disk_key, 0);

		btrfs_node_key(parent, &disk_key, 0);

		fixup_low_keys(trans, root, path, &disk_key, level + 1);

		fixup_low_keys(root, path, &disk_key, level + 1);

	}

	}

	btrfs_mark_buffer_dirty(parent);

	btrfs_mark_buffer_dirty(parent);

}

}
@@ -4749,7 +4747,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
			struct btrfs_disk_key disk_key;

			struct btrfs_disk_key disk_key;





			btrfs_item_key(leaf, &disk_key, 0);

			btrfs_item_key(leaf, &disk_key, 0);

			fixup_low_keys(trans, root, path, &disk_key, 1);

			fixup_low_keys(root, path, &disk_key, 1);

		}

		}





		/* delete the leaf if it is mostly empty */

		/* delete the leaf if it is mostly empty */