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

btrfs: remove parameter blocksize from read_tree_block 



We know the tree block size, no need to pass it around.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 453848a0

fs/btrfs/backref.c

+2 −4
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info, 
			continue;

		BUG_ON(!ref->wanted_disk_byte);

		eb = read_tree_block(fs_info->tree_root, ref->wanted_disk_byte,

				     fs_info->tree_root->nodesize, 0);

				     0);

		if (!eb || !extent_buffer_uptodate(eb)) {

			free_extent_buffer(eb);

			return -EIO;
@@ -1028,12 +1028,10 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, 
		if (ref->count && ref->parent) {

			if (extent_item_pos && !ref->inode_list &&

			    ref->level == 0) {

				u32 bsz;

				struct extent_buffer *eb;



				bsz = fs_info->extent_root->nodesize;

				eb = read_tree_block(fs_info->extent_root,

							   ref->parent, bsz, 0);

							   ref->parent, 0);

				if (!eb || !extent_buffer_uptodate(eb)) {

					free_extent_buffer(eb);

					ret = -EIO;

fs/btrfs/ctree.c

+3 −7
Original line number Diff line number Diff line
@@ -1425,7 +1425,6 @@ get_old_root(struct btrfs_root *root, u64 time_seq) 
	struct tree_mod_root *old_root = NULL;

	u64 old_generation = 0;

	u64 logical;

	u32 blocksize;



	eb_root = btrfs_read_lock_root_node(root);

	tm = __tree_mod_log_oldest_root(root->fs_info, eb_root, time_seq);
@@ -1444,8 +1443,7 @@ get_old_root(struct btrfs_root *root, u64 time_seq) 
	if (old_root && tm && tm->op != MOD_LOG_KEY_REMOVE_WHILE_FREEING) {

		btrfs_tree_read_unlock(eb_root);

		free_extent_buffer(eb_root);

		blocksize = root->nodesize;

		old = read_tree_block(root, logical, blocksize, 0);

		old = read_tree_block(root, logical, 0);

		if (WARN_ON(!old || !extent_buffer_uptodate(old))) {

			free_extent_buffer(old);

			btrfs_warn(root->fs_info,
@@ -1692,8 +1690,7 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans, 
			uptodate = 0;

		if (!cur || !uptodate) {

			if (!cur) {

				cur = read_tree_block(root, blocknr,

							 blocksize, gen);

				cur = read_tree_block(root, blocknr, gen);

				if (!cur || !extent_buffer_uptodate(cur)) {

					free_extent_buffer(cur);

					return -EIO;
@@ -1872,7 +1869,6 @@ static noinline struct extent_buffer *read_node_slot(struct btrfs_root *root, 
	BUG_ON(level == 0);



	eb = read_tree_block(root, btrfs_node_blockptr(parent, slot),

			     root->nodesize,

			     btrfs_node_ptr_generation(parent, slot));

	if (eb && !extent_buffer_uptodate(eb)) {

		free_extent_buffer(eb);
@@ -2507,7 +2503,7 @@ read_block_for_search(struct btrfs_trans_handle *trans, 
	btrfs_release_path(p);



	ret = -EAGAIN;

	tmp = read_tree_block(root, blocknr, blocksize, 0);

	tmp = read_tree_block(root, blocknr, 0);

	if (tmp) {

		/*

		 * If the read above didn't mark this buffer up to date,

fs/btrfs/disk-io.c

+5 −12
Original line number Diff line number Diff line
@@ -1138,12 +1138,12 @@ int btrfs_wait_tree_block_writeback(struct extent_buffer *buf) 
}



struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,

				      u32 blocksize, u64 parent_transid)

				      u64 parent_transid)

{

	struct extent_buffer *buf = NULL;

	int ret;



	buf = btrfs_find_create_tree_block(root, bytenr, blocksize);

	buf = btrfs_find_create_tree_block(root, bytenr, root->nodesize);

	if (!buf)

		return NULL;
@@ -1484,7 +1484,6 @@ static struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root, 
	struct btrfs_fs_info *fs_info = tree_root->fs_info;

	struct btrfs_path *path;

	u64 generation;

	u32 blocksize;

	int ret;



	path = btrfs_alloc_path();
@@ -1509,9 +1508,8 @@ static struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root, 
	}



	generation = btrfs_root_generation(&root->root_item);

	blocksize = root->nodesize;

	root->node = read_tree_block(root, btrfs_root_bytenr(&root->root_item),

				     blocksize, generation);

				     generation);

	if (!root->node) {

		ret = -ENOMEM;

		goto find_fail;
@@ -2139,7 +2137,6 @@ int open_ctree(struct super_block *sb, 
{

	u32 sectorsize;

	u32 nodesize;

	u32 blocksize;

	u32 stripesize;

	u64 generation;

	u64 features;
@@ -2643,7 +2640,6 @@ int open_ctree(struct super_block *sb, 
		goto fail_sb_buffer;

	}



	blocksize = tree_root->nodesize;

	generation = btrfs_super_chunk_root_generation(disk_super);



	__setup_root(nodesize, sectorsize, stripesize, chunk_root,
@@ -2651,7 +2647,7 @@ int open_ctree(struct super_block *sb, 


	chunk_root->node = read_tree_block(chunk_root,

					   btrfs_super_chunk_root(disk_super),

					   blocksize, generation);

					   generation);

	if (!chunk_root->node ||

	    !test_bit(EXTENT_BUFFER_UPTODATE, &chunk_root->node->bflags)) {

		printk(KERN_WARNING "BTRFS: failed to read chunk root on %s\n",
@@ -2684,12 +2680,11 @@ int open_ctree(struct super_block *sb, 
	}



retry_root_backup:

	blocksize = tree_root->nodesize;

	generation = btrfs_super_generation(disk_super);



	tree_root->node = read_tree_block(tree_root,

					  btrfs_super_root(disk_super),

					  blocksize, generation);

					  generation);

	if (!tree_root->node ||

	    !test_bit(EXTENT_BUFFER_UPTODATE, &tree_root->node->bflags)) {

		printk(KERN_WARNING "BTRFS: failed to read tree root on %s\n",
@@ -2858,7 +2853,6 @@ int open_ctree(struct super_block *sb, 
			err = -EIO;

			goto fail_qgroup;

		}

		blocksize = tree_root->nodesize;



		log_tree_root = btrfs_alloc_root(fs_info);

		if (!log_tree_root) {
@@ -2870,7 +2864,6 @@ int open_ctree(struct super_block *sb, 
			     log_tree_root, fs_info, BTRFS_TREE_LOG_OBJECTID);



		log_tree_root->node = read_tree_block(tree_root, bytenr,

						      blocksize,

						      generation + 1);

		if (!log_tree_root->node ||

		    !extent_buffer_uptodate(log_tree_root->node)) {

fs/btrfs/disk-io.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct btrfs_device; 
struct btrfs_fs_devices;



struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,

				      u32 blocksize, u64 parent_transid);

				      u64 parent_transid);

void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize);

int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,

			 int mirror_num, struct extent_buffer **eb);

fs/btrfs/extent-tree.c

+3 −5
Original line number Diff line number Diff line
@@ -7645,7 +7645,6 @@ static int account_shared_subtree(struct btrfs_trans_handle *trans, 
	level = root_level;

	while (level >= 0) {

		if (path->nodes[level] == NULL) {

			int child_bsize = root->nodesize;

			int parent_slot;

			u64 child_gen;

			u64 child_bytenr;
@@ -7657,8 +7656,7 @@ static int account_shared_subtree(struct btrfs_trans_handle *trans, 
			child_bytenr = btrfs_node_blockptr(eb, parent_slot);

			child_gen = btrfs_node_ptr_generation(eb, parent_slot);



			eb = read_tree_block(root, child_bytenr, child_bsize,

					     child_gen);

			eb = read_tree_block(root, child_bytenr, child_gen);

			if (!eb || !extent_buffer_uptodate(eb)) {

				ret = -EIO;

				goto out;
@@ -7674,7 +7672,7 @@ static int account_shared_subtree(struct btrfs_trans_handle *trans, 
			ret = btrfs_qgroup_record_ref(trans, root->fs_info,

						root->objectid,

						child_bytenr,

						child_bsize,

						root->nodesize,

						BTRFS_QGROUP_OPER_SUB_SUBTREE,

						0);

			if (ret)
@@ -7889,7 +7887,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, 
	if (!next) {

		if (reada && level == 1)

			reada_walk_down(trans, root, wc, path);

		next = read_tree_block(root, bytenr, blocksize, generation);

		next = read_tree_block(root, bytenr, generation);

		if (!next || !extent_buffer_uptodate(next)) {

			free_extent_buffer(next);

			return -EIO;