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

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

Btrfs: cleanup of function where fixup_low_keys() is called 



If argument 'trans' is unnecessary in the function where
fixup_low_keys() is called, 'trans' is deleted.

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

fs/btrfs/ctree.c

+12 −16
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ static int balance_node_right(struct btrfs_trans_handle *trans, 
			      struct btrfs_root *root,

			      struct extent_buffer *dst_buf,

			      struct extent_buffer *src_buf);

static void del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root,

		    struct btrfs_path *path, int level, int slot);

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

		    int level, int slot);

static void tree_mod_log_free_eb(struct btrfs_fs_info *fs_info,

				 struct extent_buffer *eb);

struct extent_buffer *read_old_tree_block(struct btrfs_root *root, u64 bytenr,
@@ -1830,7 +1830,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 
		if (btrfs_header_nritems(right) == 0) {

			clean_tree_block(trans, root, right);

			btrfs_tree_unlock(right);

			del_ptr(trans, root, path, level + 1, pslot + 1);

			del_ptr(root, path, level + 1, pslot + 1);

			root_sub_used(root, right->len);

			btrfs_free_tree_block(trans, root, right, 0, 1);

			free_extent_buffer_stale(right);
@@ -1874,7 +1874,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, 
	if (btrfs_header_nritems(mid) == 0) {

		clean_tree_block(trans, root, mid);

		btrfs_tree_unlock(mid);

		del_ptr(trans, root, path, level + 1, pslot);

		del_ptr(root, path, level + 1, pslot);

		root_sub_used(root, mid->len);

		btrfs_free_tree_block(trans, root, mid, 0, 1);

		free_extent_buffer_stale(mid);
@@ -2930,8 +2930,7 @@ static void fixup_low_keys(struct btrfs_root *root, struct btrfs_path *path, 
 * This function isn't completely safe. It's the caller's responsibility

 * that the new key won't break the order

 */

void btrfs_set_item_key_safe(struct btrfs_trans_handle *trans,

			     struct btrfs_root *root, struct btrfs_path *path,

void btrfs_set_item_key_safe(struct btrfs_root *root, struct btrfs_path *path,

			     struct btrfs_key *new_key)

{

	struct btrfs_disk_key disk_key;
@@ -4267,7 +4266,7 @@ int btrfs_duplicate_item(struct btrfs_trans_handle *trans, 
		return ret;



	path->slots[0]++;

	setup_items_for_insert(trans, root, path, new_key, &item_size,

	setup_items_for_insert(root, path, new_key, &item_size,

			       item_size, item_size +

			       sizeof(struct btrfs_item), 1);

	leaf = path->nodes[0];
@@ -4284,9 +4283,7 @@ int btrfs_duplicate_item(struct btrfs_trans_handle *trans, 
 * off the end of the item or if we shift the item to chop bytes off

 * the front.

 */

void btrfs_truncate_item(struct btrfs_trans_handle *trans,

			 struct btrfs_root *root,

			 struct btrfs_path *path,

void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,

			 u32 new_size, int from_end)

{

	int slot;
@@ -4457,8 +4454,7 @@ void btrfs_extend_item(struct btrfs_trans_handle *trans, 
 * to save stack depth by doing the bulk of the work in a function

 * that doesn't call btrfs_search_slot

 */

void setup_items_for_insert(struct btrfs_trans_handle *trans,

			    struct btrfs_root *root, struct btrfs_path *path,

void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,

			    struct btrfs_key *cpu_key, u32 *data_size,

			    u32 total_data, u32 total_size, int nr)

{
@@ -4574,7 +4570,7 @@ int btrfs_insert_empty_items(struct btrfs_trans_handle *trans, 
	slot = path->slots[0];

	BUG_ON(slot < 0);



	setup_items_for_insert(trans, root, path, cpu_key, data_size,

	setup_items_for_insert(root, path, cpu_key, data_size,

			       total_data, total_size, nr);

	return 0;

}
@@ -4612,8 +4608,8 @@ int btrfs_insert_item(struct btrfs_trans_handle *trans, struct btrfs_root 
 * the tree should have been previously balanced so the deletion does not

 * empty a node.

 */

static void del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root,

		    struct btrfs_path *path, int level, int slot)

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

		    int level, int slot)

{

	struct extent_buffer *parent = path->nodes[level];

	u32 nritems;
@@ -4666,7 +4662,7 @@ static noinline void btrfs_del_leaf(struct btrfs_trans_handle *trans, 
				    struct extent_buffer *leaf)

{

	WARN_ON(btrfs_header_generation(leaf) != trans->transid);

	del_ptr(trans, root, path, 1, path->slots[1]);

	del_ptr(root, path, 1, path->slots[1]);



	/*

	 * btrfs_free_extent is expensive, we want to make sure we

fs/btrfs/ctree.h

+3 −7
Original line number Diff line number Diff line
@@ -3183,8 +3183,7 @@ int btrfs_comp_cpu_keys(struct btrfs_key *k1, struct btrfs_key *k2); 
int btrfs_previous_item(struct btrfs_root *root,

			struct btrfs_path *path, u64 min_objectid,

			int type);

void btrfs_set_item_key_safe(struct btrfs_trans_handle *trans,

			     struct btrfs_root *root, struct btrfs_path *path,

void btrfs_set_item_key_safe(struct btrfs_root *root, struct btrfs_path *path,

			     struct btrfs_key *new_key);

struct extent_buffer *btrfs_root_node(struct btrfs_root *root);

struct extent_buffer *btrfs_lock_root_node(struct btrfs_root *root);
@@ -3223,9 +3222,7 @@ int btrfs_block_can_be_shared(struct btrfs_root *root, 
void btrfs_extend_item(struct btrfs_trans_handle *trans,

		       struct btrfs_root *root, struct btrfs_path *path,

		       u32 data_size);

void btrfs_truncate_item(struct btrfs_trans_handle *trans,

			 struct btrfs_root *root,

			 struct btrfs_path *path,

void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,

			 u32 new_size, int from_end);

int btrfs_split_item(struct btrfs_trans_handle *trans,

		     struct btrfs_root *root,
@@ -3265,8 +3262,7 @@ static inline int btrfs_del_item(struct btrfs_trans_handle *trans, 
	return btrfs_del_items(trans, root, path, path->slots[0], 1);

}



void setup_items_for_insert(struct btrfs_trans_handle *trans,

			    struct btrfs_root *root, struct btrfs_path *path,

void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path,

			    struct btrfs_key *cpu_key, u32 *data_size,

			    u32 total_data, u32 total_size, int nr);

int btrfs_insert_item(struct btrfs_trans_handle *trans, struct btrfs_root

fs/btrfs/delayed-inode.c

+5 −6
Original line number Diff line number Diff line
@@ -766,8 +766,7 @@ static void btrfs_delayed_inode_release_metadata(struct btrfs_root *root, 
 * This helper will insert some continuous items into the same leaf according

 * to the free space of the leaf.

 */

static int btrfs_batch_insert_items(struct btrfs_trans_handle *trans,

				struct btrfs_root *root,

static int btrfs_batch_insert_items(struct btrfs_root *root,

				    struct btrfs_path *path,

				    struct btrfs_delayed_item *item)

{
@@ -848,7 +847,7 @@ static int btrfs_batch_insert_items(struct btrfs_trans_handle *trans, 
	btrfs_clear_path_blocking(path, NULL, 0);



	/* insert the keys of the items */

	setup_items_for_insert(trans, root, path, keys, data_size,

	setup_items_for_insert(root, path, keys, data_size,

			       total_data_size, total_size, nitems);



	/* insert the dir index items */
@@ -932,7 +931,7 @@ static int btrfs_insert_delayed_items(struct btrfs_trans_handle *trans, 
	if (curr && btrfs_is_continuous_delayed_item(prev, curr)) {

		/* insert the continuous items into the same leaf */

		path->slots[0]++;

		btrfs_batch_insert_items(trans, root, path, curr);

		btrfs_batch_insert_items(root, path, curr);

	}

	btrfs_release_delayed_item(prev);

	btrfs_mark_buffer_dirty(path->nodes[0]);

fs/btrfs/dir-item.c

+1 −2
Original line number Diff line number Diff line
@@ -442,8 +442,7 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans, 
		start = btrfs_item_ptr_offset(leaf, path->slots[0]);

		memmove_extent_buffer(leaf, ptr, ptr + sub_item_len,

			item_len - (ptr + sub_item_len - start));

		btrfs_truncate_item(trans, root, path,

				    item_len - sub_item_len, 1);

		btrfs_truncate_item(root, path, item_len - sub_item_len, 1);

	}

	return ret;

}

fs/btrfs/extent-tree.c

+4 −5
Original line number Diff line number Diff line
@@ -1752,8 +1752,7 @@ static int lookup_extent_backref(struct btrfs_trans_handle *trans, 
 * helper to update/remove inline back ref

 */

static noinline_for_stack

void update_inline_extent_backref(struct btrfs_trans_handle *trans,

				  struct btrfs_root *root,

void update_inline_extent_backref(struct btrfs_root *root,

				  struct btrfs_path *path,

				  struct btrfs_extent_inline_ref *iref,

				  int refs_to_mod,
@@ -1809,7 +1808,7 @@ void update_inline_extent_backref(struct btrfs_trans_handle *trans, 
			memmove_extent_buffer(leaf, ptr, ptr + size,

					      end - ptr - size);

		item_size -= size;

		btrfs_truncate_item(trans, root, path, item_size, 1);

		btrfs_truncate_item(root, path, item_size, 1);

	}

	btrfs_mark_buffer_dirty(leaf);

}
@@ -1831,7 +1830,7 @@ int insert_inline_extent_backref(struct btrfs_trans_handle *trans, 
					   root_objectid, owner, offset, 1);

	if (ret == 0) {

		BUG_ON(owner < BTRFS_FIRST_FREE_OBJECTID);

		update_inline_extent_backref(trans, root, path, iref,

		update_inline_extent_backref(root, path, iref,

					     refs_to_add, extent_op);

	} else if (ret == -ENOENT) {

		setup_inline_extent_backref(trans, root, path, iref, parent,
@@ -1871,7 +1870,7 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans, 


	BUG_ON(!is_data && refs_to_drop != 1);

	if (iref) {

		update_inline_extent_backref(trans, root, path, iref,

		update_inline_extent_backref(root, path, iref,

					     -refs_to_drop, NULL);

	} else if (is_data) {

		ret = remove_extent_data_ref(trans, root, path, refs_to_drop);