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>

diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
index 3f047758ec247863300adc1db0e12ee2c561b939..5c988b57b90e6cb9a160a900296714c035c871b7 100644 (file)
--- 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 96cf044df737415eb4c7f21c027fffb1ae5de6a6..32fecc9dc1dd26b7e561d2cb3ee82d8ea99ccd4e 100644 (file)
--- 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 4576f0e69d336183433f5f2d8e8c711997842397..9a550b26801746cd5f2e91d7679aa304cc346db5 100644 (file)
--- 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;
        }