Commit c88ebf1d authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: simplify arguments for btrfs_verify_level_key() 



The only caller of btrfs_verify_level_key() is read_block_for_search() and
it's passing 3 arguments to it that can be extracted from its on stack
variable of type struct btrfs_tree_parent_check.

So change btrfs_verify_level_key() to accept an argument of type
struct btrfs_tree_parent_check instead of level, first key and parent
transid arguments.

Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2b1ef80d

fs/btrfs/ctree.c

+1 −2
Original line number Diff line number Diff line
@@ -1551,8 +1551,7 @@ read_block_for_search(struct btrfs_root *root, struct btrfs_path *p, 
			 * being cached, read from scrub, or have multiple

			 * parents (shared tree blocks).

			 */

			if (btrfs_verify_level_key(tmp,

					parent_level - 1, &check.first_key, gen)) {

			if (btrfs_verify_level_key(tmp, &check)) {

				ret = -EUCLEAN;

				goto out;

			}

fs/btrfs/tree-checker.c

+8 −8
Original line number Diff line number Diff line
@@ -2183,8 +2183,8 @@ int btrfs_check_eb_owner(const struct extent_buffer *eb, u64 root_owner) 
	return 0;

}



int btrfs_verify_level_key(struct extent_buffer *eb, int level,

			   struct btrfs_key *first_key, u64 parent_transid)

int btrfs_verify_level_key(struct extent_buffer *eb,

			   const struct btrfs_tree_parent_check *check)

{

	struct btrfs_fs_info *fs_info = eb->fs_info;

	int found_level;
@@ -2192,16 +2192,16 @@ int btrfs_verify_level_key(struct extent_buffer *eb, int level, 
	int ret;



	found_level = btrfs_header_level(eb);

	if (found_level != level) {

	if (found_level != check->level) {

		WARN(IS_ENABLED(CONFIG_BTRFS_DEBUG),

		     KERN_ERR "BTRFS: tree level check failed\n");

		btrfs_err(fs_info,

"tree level mismatch detected, bytenr=%llu level expected=%u has=%u",

			  eb->start, level, found_level);

			  eb->start, check->level, found_level);

		return -EIO;

	}



	if (!first_key)

	if (!check->has_first_key)

		return 0;



	/*
@@ -2226,15 +2226,15 @@ int btrfs_verify_level_key(struct extent_buffer *eb, int level, 
		btrfs_node_key_to_cpu(eb, &found_key, 0);

	else

		btrfs_item_key_to_cpu(eb, &found_key, 0);

	ret = btrfs_comp_cpu_keys(first_key, &found_key);

	ret = btrfs_comp_cpu_keys(&check->first_key, &found_key);



	if (ret) {

		WARN(IS_ENABLED(CONFIG_BTRFS_DEBUG),

		     KERN_ERR "BTRFS: tree first key check failed\n");

		btrfs_err(fs_info,

"tree first key mismatch detected, bytenr=%llu parent_transid=%llu key expected=(%llu,%u,%llu) has=(%llu,%u,%llu)",

			  eb->start, parent_transid, first_key->objectid,

			  first_key->type, first_key->offset,

			  eb->start, check->transid, check->first_key.objectid,

			  check->first_key.type, check->first_key.offset,

			  found_key.objectid, found_key.type,

			  found_key.offset);

	}

fs/btrfs/tree-checker.h

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ int btrfs_check_node(struct extent_buffer *node); 
int btrfs_check_chunk_valid(struct extent_buffer *leaf,

			    struct btrfs_chunk *chunk, u64 logical);

int btrfs_check_eb_owner(const struct extent_buffer *eb, u64 root_owner);

int btrfs_verify_level_key(struct extent_buffer *eb, int level,

			   struct btrfs_key *first_key, u64 parent_transid);

int btrfs_verify_level_key(struct extent_buffer *eb,

			   const struct btrfs_tree_parent_check *check);



#endif