Commit 3dc9dc89 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: eliminate total_size parameter from setup_items_for_insert 



The value of this argument can be derived from the total_data as it's
simply the value of the data size + size of btrfs_items being touched.
Move the parameter calculation inside the function. This results in a
simpler interface and also a minor size reduction:

./scripts/bloat-o-meter ctree.original fs/btrfs/ctree.o
add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-34 (-34)
Function                                     old     new   delta
btrfs_duplicate_item                         260     259      -1
setup_items_for_insert                      1200    1190     -10
btrfs_insert_empty_items                     177     154     -23

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent fc0716c2

fs/btrfs/ctree.c

+4 −6
Original line number Diff line number Diff line
@@ -4580,9 +4580,7 @@ int btrfs_duplicate_item(struct btrfs_trans_handle *trans, 
		return ret;



	path->slots[0]++;

	setup_items_for_insert(root, path, new_key, &item_size,

			       item_size, item_size +

			       sizeof(struct btrfs_item), 1);

	setup_items_for_insert(root, path, new_key, &item_size, item_size, 1);

	leaf = path->nodes[0];

	memcpy_extent_buffer(leaf,

			     btrfs_item_ptr_offset(leaf, path->slots[0]),
@@ -4762,7 +4760,7 @@ void btrfs_extend_item(struct btrfs_path *path, u32 data_size) 
 */

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

			    const struct btrfs_key *cpu_key, u32 *data_size,

			    u32 total_data, u32 total_size, int nr)

			    u32 total_data, int nr)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_item *item;
@@ -4773,6 +4771,7 @@ void setup_items_for_insert(struct btrfs_root *root, struct btrfs_path *path, 
	struct extent_buffer *leaf;

	int slot;

	struct btrfs_map_token token;

	const u32 total_size = total_data + (nr * sizeof(struct btrfs_item));



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

		btrfs_cpu_key_to_disk(&disk_key, cpu_key);
@@ -4875,8 +4874,7 @@ int btrfs_insert_empty_items(struct btrfs_trans_handle *trans, 
	slot = path->slots[0];

	BUG_ON(slot < 0);



	setup_items_for_insert(root, path, cpu_key, data_size,

			       total_data, total_size, nr);

	setup_items_for_insert(root, path, cpu_key, data_size, total_data, nr);

	return 0;

}

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -2744,7 +2744,7 @@ static inline int btrfs_del_item(struct btrfs_trans_handle *trans, 


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

			    const struct btrfs_key *cpu_key, u32 *data_size,

			    u32 total_data, u32 total_size, int nr);

			    u32 total_data, int nr);

int btrfs_insert_item(struct btrfs_trans_handle *trans, struct btrfs_root *root,

		      const struct btrfs_key *key, void *data, u32 data_size);

int btrfs_insert_empty_items(struct btrfs_trans_handle *trans,

fs/btrfs/delayed-inode.c

+2 −2
Original line number Diff line number Diff line
@@ -768,8 +768,8 @@ static int btrfs_batch_insert_items(struct btrfs_root *root, 
	}



	/* insert the keys of the items */

	setup_items_for_insert(root, path, keys, data_size,

			       total_data_size, total_size, nitems);

	setup_items_for_insert(root, path, keys, data_size, total_data_size,

			       nitems);



	/* insert the dir index items */

	slot = path->slots[0];

fs/btrfs/file.c

+1 −4
Original line number Diff line number Diff line
@@ -1057,10 +1057,7 @@ int __btrfs_drop_extents(struct btrfs_trans_handle *trans, 
			if (btrfs_comp_cpu_keys(&key, &slot_key) > 0)

				path->slots[0]++;

		}

		setup_items_for_insert(root, path, &key,

				       &extent_item_size,

				       extent_item_size,

				       sizeof(struct btrfs_item) +

		setup_items_for_insert(root, path, &key, &extent_item_size,

				       extent_item_size, 1);

		*key_inserted = 1;

	}

fs/btrfs/tests/extent-buffer-tests.c

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ static int test_btrfs_split_item(u32 sectorsize, u32 nodesize) 
	key.type = BTRFS_EXTENT_CSUM_KEY;

	key.offset = 0;



	setup_items_for_insert(root, path, &key, &value_len, value_len,

			       value_len + sizeof(struct btrfs_item), 1);

	setup_items_for_insert(root, path, &key, &value_len, value_len, 1);

	item = btrfs_item_nr(0);

	write_extent_buffer(eb, value, btrfs_item_ptr_offset(eb, 0),

			    value_len);