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

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

btrfs: get fs_info from eb in btrfs_verify_level_key 



We can read fs_info from extent buffer and can drop it from the
parameters.

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

fs/btrfs/ctree.c

+1 −1
Original line number Diff line number Diff line
@@ -2420,7 +2420,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(fs_info, tmp,

			if (btrfs_verify_level_key(tmp,

					parent_level - 1, &first_key, gen)) {

				free_extent_buffer(tmp);

				return -EUCLEAN;

fs/btrfs/disk-io.c

+3 −3
Original line number Diff line number Diff line
@@ -394,10 +394,10 @@ static int btrfs_check_super_csum(struct btrfs_fs_info *fs_info, 
	return ret;

}



int btrfs_verify_level_key(struct btrfs_fs_info *fs_info,

			   struct extent_buffer *eb, int level,

int btrfs_verify_level_key(struct extent_buffer *eb, int level,

			   struct btrfs_key *first_key, u64 parent_transid)

{

	struct btrfs_fs_info *fs_info = eb->fs_info;

	int found_level;

	struct btrfs_key found_key;

	int ret;
@@ -471,7 +471,7 @@ static int btree_read_extent_buffer_pages(struct extent_buffer *eb, 
			if (verify_parent_transid(io_tree, eb,

						   parent_transid, 0))

				ret = -EIO;

			else if (btrfs_verify_level_key(fs_info, eb, level,

			else if (btrfs_verify_level_key(eb, level,

						first_key, parent_transid))

				ret = -EUCLEAN;

			else

fs/btrfs/disk-io.h

+1 −2
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ static inline u64 btrfs_sb_offset(int mirror) 
struct btrfs_device;

struct btrfs_fs_devices;



int btrfs_verify_level_key(struct btrfs_fs_info *fs_info,

			   struct extent_buffer *eb, int level,

int btrfs_verify_level_key(struct extent_buffer *eb, int level,

			   struct btrfs_key *first_key, u64 parent_transid);

struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,

				      u64 parent_transid, int level,