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

Commit b159fa28 authored by David Sterba's avatar David Sterba
Browse files

btrfs: remove constant parameter to memset_extent_buffer and rename it 



The only memset we do is to 0, so sink the parameter to the function and
simplify all calls. Rename the function to reflect the behaviour.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent fba1acf9

fs/btrfs/ctree.c

+3 −3
Original line number Diff line number Diff line
@@ -3348,7 +3348,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans, 


	root_add_used(root, root->nodesize);



	memset_extent_buffer(c, 0, 0, sizeof(struct btrfs_header));

	memzero_extent_buffer(c, 0, sizeof(struct btrfs_header));

	btrfs_set_header_nritems(c, 1);

	btrfs_set_header_level(c, level);

	btrfs_set_header_bytenr(c, c->start);
@@ -3484,7 +3484,7 @@ static noinline int split_node(struct btrfs_trans_handle *trans, 


	root_add_used(root, root->nodesize);



	memset_extent_buffer(split, 0, 0, sizeof(struct btrfs_header));

	memzero_extent_buffer(split, 0, sizeof(struct btrfs_header));

	btrfs_set_header_level(split, btrfs_header_level(c));

	btrfs_set_header_bytenr(split, split->start);

	btrfs_set_header_generation(split, trans->transid);
@@ -4270,7 +4270,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans, 


	root_add_used(root, root->nodesize);



	memset_extent_buffer(right, 0, 0, sizeof(struct btrfs_header));

	memzero_extent_buffer(right, 0, sizeof(struct btrfs_header));

	btrfs_set_header_bytenr(right, right->start);

	btrfs_set_header_generation(right, trans->transid);

	btrfs_set_header_backref_rev(right, BTRFS_MIXED_BACKREF_REV);

fs/btrfs/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -1412,7 +1412,7 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, 
		goto fail;

	}



	memset_extent_buffer(leaf, 0, 0, sizeof(struct btrfs_header));

	memzero_extent_buffer(leaf, 0, sizeof(struct btrfs_header));

	btrfs_set_header_bytenr(leaf, leaf->start);

	btrfs_set_header_generation(leaf, trans->transid);

	btrfs_set_header_backref_rev(leaf, BTRFS_MIXED_BACKREF_REV);
@@ -1496,7 +1496,7 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans, 
		return ERR_CAST(leaf);

	}



	memset_extent_buffer(leaf, 0, 0, sizeof(struct btrfs_header));

	memzero_extent_buffer(leaf, 0, sizeof(struct btrfs_header));

	btrfs_set_header_bytenr(leaf, leaf->start);

	btrfs_set_header_generation(leaf, trans->transid);

	btrfs_set_header_backref_rev(leaf, BTRFS_MIXED_BACKREF_REV);

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ static int convert_extent_item_v0(struct btrfs_trans_handle *trans, 
				       BTRFS_BLOCK_FLAG_FULL_BACKREF);

		bi = (struct btrfs_tree_block_info *)(item + 1);

		/* FIXME: get first key of the block */

		memset_extent_buffer(leaf, 0, (unsigned long)bi, sizeof(*bi));

		memzero_extent_buffer(leaf, (unsigned long)bi, sizeof(*bi));

		btrfs_set_tree_block_level(leaf, bi, (int)owner);

	} else {

		btrfs_set_extent_flags(leaf, item, BTRFS_EXTENT_FLAG_DATA);

fs/btrfs/extent_io.c

+5 −5
Original line number Diff line number Diff line
@@ -3743,7 +3743,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb, 
	if (btrfs_header_level(eb) > 0) {

		end = btrfs_node_key_ptr_offset(nritems);



		memset_extent_buffer(eb, 0, end, eb->len - end);

		memzero_extent_buffer(eb, end, eb->len - end);

	} else {

		/*

		 * leaf:
@@ -3752,7 +3752,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb, 
		start = btrfs_item_nr_offset(nritems);

		end = btrfs_leaf_data(eb) +

		      leaf_data_end(fs_info->tree_root, eb);

		memset_extent_buffer(eb, 0, start, end - start);

		memzero_extent_buffer(eb, start, end - start);

	}



	for (i = 0; i < num_pages; i++) {
@@ -5517,8 +5517,8 @@ void write_extent_buffer(struct extent_buffer *eb, const void *srcv, 
	}

}



void memset_extent_buffer(struct extent_buffer *eb, char c,

			  unsigned long start, unsigned long len)

void memzero_extent_buffer(struct extent_buffer *eb, unsigned long start,

		unsigned long len)

{

	size_t cur;

	size_t offset;
@@ -5538,7 +5538,7 @@ void memset_extent_buffer(struct extent_buffer *eb, char c, 


		cur = min(len, PAGE_SIZE - offset);

		kaddr = page_address(page);

		memset(kaddr + offset, c, cur);

		memset(kaddr + offset, 0, cur);



		len -= cur;

		offset = 0;

fs/btrfs/extent_io.h

+2 −2
Original line number Diff line number Diff line
@@ -417,8 +417,8 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, 
			   unsigned long src_offset, unsigned long len);

void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,

			   unsigned long src_offset, unsigned long len);

void memset_extent_buffer(struct extent_buffer *eb, char c,

			  unsigned long start, unsigned long len);

void memzero_extent_buffer(struct extent_buffer *eb, unsigned long start,

			   unsigned long len);

int extent_buffer_test_bit(struct extent_buffer *eb, unsigned long start,

			   unsigned long pos);

void extent_buffer_bitmap_set(struct extent_buffer *eb, unsigned long start,