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

btrfs: get fs_info from eb in btrfs_check_chunk_valid 



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 6ec0896c

fs/btrfs/tree-checker.c

+3 −4
Original line number Diff line number Diff line
@@ -498,10 +498,10 @@ static void chunk_err(const struct extent_buffer *leaf, 
 * Return -EUCLEAN if anything is corrupted.

 * Return 0 if everything is OK.

 */

int btrfs_check_chunk_valid(struct btrfs_fs_info *fs_info,

			    struct extent_buffer *leaf,

int btrfs_check_chunk_valid(struct extent_buffer *leaf,

			    struct btrfs_chunk *chunk, u64 logical)

{

	struct btrfs_fs_info *fs_info = leaf->fs_info;

	u64 length;

	u64 stripe_len;

	u16 num_stripes;
@@ -793,8 +793,7 @@ static int check_leaf_item(struct extent_buffer *leaf, 
		break;

	case BTRFS_CHUNK_ITEM_KEY:

		chunk = btrfs_item_ptr(leaf, slot, struct btrfs_chunk);

		ret = btrfs_check_chunk_valid(leaf->fs_info, leaf, chunk,

					      key->offset);

		ret = btrfs_check_chunk_valid(leaf, chunk, key->offset);

		break;

	case BTRFS_DEV_ITEM_KEY:

		ret = check_dev_item(leaf, key, slot);

fs/btrfs/tree-checker.h

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ int btrfs_check_leaf_full(struct extent_buffer *leaf); 
int btrfs_check_leaf_relaxed(struct extent_buffer *leaf);

int btrfs_check_node(struct extent_buffer *node);



int btrfs_check_chunk_valid(struct btrfs_fs_info *fs_info,

			    struct extent_buffer *leaf,

int btrfs_check_chunk_valid(struct extent_buffer *leaf,

			    struct btrfs_chunk *chunk, u64 logical);



#endif

fs/btrfs/volumes.c

+1 −1
Original line number Diff line number Diff line
@@ -6710,7 +6710,7 @@ static int read_one_chunk(struct btrfs_fs_info *fs_info, struct btrfs_key *key, 
	 * as chunk item in tree block is already verified by tree-checker.

	 */

	if (leaf->start == BTRFS_SUPER_INFO_OFFSET) {

		ret = btrfs_check_chunk_valid(fs_info, leaf, chunk, logical);

		ret = btrfs_check_chunk_valid(leaf, chunk, logical);

		if (ret)

			return ret;

	}