diff options
| author | David Sterba <dsterba@suse.com> | 2019-03-20 18:40:48 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-04-29 20:02:39 +0300 |
| commit | ddaf1d5aef2c34f0cf5b0d71a48f9d88c5a0e2dc (patch) | |
| tree | a4d9170bf4d5c47d6da1be05ab8b78b32a8e08ca | |
| parent | 6ec0896c4c810da6abf2130f13cbbe38a8955697 (diff) | |
| download | linux-ddaf1d5aef2c34f0cf5b0d71a48f9d88c5a0e2dc.tar.xz | |
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: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/tree-checker.c | 7 | ||||
| -rw-r--r-- | fs/btrfs/tree-checker.h | 3 | ||||
| -rw-r--r-- | fs/btrfs/volumes.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c index 3f047758ec24..5c988b57b90e 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -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); diff --git a/fs/btrfs/tree-checker.h b/fs/btrfs/tree-checker.h index 96cf044df737..32fecc9dc1dd 100644 --- a/fs/btrfs/tree-checker.h +++ b/fs/btrfs/tree-checker.h @@ -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 diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 4576f0e69d33..9a550b268017 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -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; } |