btrfs: remove fs_info argument from btrfs_dump_space_info()

We don't need it since we can grab fs_info from the given space_info.
So remove the fs_info argument.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Anand Jain <asj@kernel.org>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
index 4eceba0ff4e0fb5e5a0efe11320ed3487cb5957e..d7451400cc22e4a51d71c19f9f70c336d8eddfe1 100644 (file)
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -1424,7 +1424,7 @@ out:
        if (ret == -ENOSPC && btrfs_test_opt(cache->fs_info, ENOSPC_DEBUG)) {
                btrfs_info(cache->fs_info,
                        "unable to make block group %llu ro", cache->start);
-               btrfs_dump_space_info(cache->fs_info, cache->space_info, 0, false);
+               btrfs_dump_space_info(cache->space_info, 0, false);
        }
        return ret;
 }
@@ -4314,7 +4314,7 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,
        if (left < bytes && btrfs_test_opt(fs_info, ENOSPC_DEBUG)) {
                btrfs_info(fs_info, "left=%llu, need=%llu, flags=%llu",
                           left, bytes, type);
-               btrfs_dump_space_info(fs_info, info, 0, false);
+               btrfs_dump_space_info(info, 0, false);
        }
 
        if (left < bytes) {
@@ -4459,7 +4459,7 @@ static void check_removing_space_info(struct btrfs_space_info *space_info)
         * indicates a real bug if this happens.
         */
        if (WARN_ON(space_info->bytes_pinned > 0 || space_info->bytes_may_use > 0))
-               btrfs_dump_space_info(info, space_info, 0, false);
+               btrfs_dump_space_info(space_info, 0, false);
 
        /*
         * If there was a failure to cleanup a log tree, very likely due to an
@@ -4470,7 +4470,7 @@ static void check_removing_space_info(struct btrfs_space_info *space_info)
        if (!(space_info->flags & BTRFS_BLOCK_GROUP_METADATA) ||
            !BTRFS_FS_LOG_CLEANUP_ERROR(info)) {
                if (WARN_ON(space_info->bytes_reserved > 0))
-                       btrfs_dump_space_info(info, space_info, 0, false);
+                       btrfs_dump_space_info(space_info, 0, false);
        }
 
        WARN_ON(space_info->reclaim_size > 0);

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index dc4ca98c37800a7c6920c3cd05b35c26fb50e78d..d1e75da97f587b4e6dd1d3b1ccac931e05f9193b 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4735,8 +4735,7 @@ again:
        "allocation failed flags %llu, wanted %llu tree-log %d, relocation: %d",
                                  flags, num_bytes, for_treelog, for_data_reloc);
                        if (sinfo)
-                               btrfs_dump_space_info(fs_info, sinfo,
-                                                     num_bytes, 1);
+                               btrfs_dump_space_info(sinfo, num_bytes, 1);
                }
        }
 

diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index 599d6cce9e7761062db42af4abac8294904e039c..2e9417996970f72fb91e51ccdca85b4d4b10e672 100644 (file)
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -591,9 +591,9 @@ static void dump_global_block_rsv(struct btrfs_fs_info *fs_info)
        DUMP_BLOCK_RSV(fs_info, delayed_refs_rsv);
 }
 
-static void __btrfs_dump_space_info(const struct btrfs_fs_info *fs_info,
-                                   const struct btrfs_space_info *info)
+static void __btrfs_dump_space_info(const struct btrfs_space_info *info)
 {
+       const struct btrfs_fs_info *fs_info = info->fs_info;
        const char *flag_str = space_info_flag_to_str(info);
        lockdep_assert_held(&info->lock);
 
@@ -610,16 +610,16 @@ static void __btrfs_dump_space_info(const struct btrfs_fs_info *fs_info,
                info->bytes_readonly, info->bytes_zone_unusable);
 }
 
-void btrfs_dump_space_info(struct btrfs_fs_info *fs_info,
-                          struct btrfs_space_info *info, u64 bytes,
+void btrfs_dump_space_info(struct btrfs_space_info *info, u64 bytes,
                           bool dump_block_groups)
 {
+       struct btrfs_fs_info *fs_info = info->fs_info;
        struct btrfs_block_group *cache;
        u64 total_avail = 0;
        int index = 0;
 
        spin_lock(&info->lock);
-       __btrfs_dump_space_info(fs_info, info);
+       __btrfs_dump_space_info(info);
        dump_global_block_rsv(fs_info);
        spin_unlock(&info->lock);
 
@@ -1089,7 +1089,7 @@ static bool maybe_fail_all_tickets(struct btrfs_space_info *space_info)
 
        if (btrfs_test_opt(fs_info, ENOSPC_DEBUG)) {
                btrfs_info(fs_info, "cannot satisfy tickets, dumping space info");
-               __btrfs_dump_space_info(fs_info, space_info);
+               __btrfs_dump_space_info(space_info);
        }
 
        while (!list_empty(&space_info->tickets) &&
@@ -1882,7 +1882,7 @@ int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
                                              space_info->flags, orig_bytes, 1);
 
                if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
-                       btrfs_dump_space_info(fs_info, space_info, orig_bytes, false);
+                       btrfs_dump_space_info(space_info, orig_bytes, false);
        }
        return ret;
 }
@@ -1913,7 +1913,7 @@ int btrfs_reserve_data_bytes(struct btrfs_space_info *space_info, u64 bytes,
                trace_btrfs_space_reservation(fs_info, "space_info:enospc",
                                              space_info->flags, bytes, 1);
                if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
-                       btrfs_dump_space_info(fs_info, space_info, bytes, false);
+                       btrfs_dump_space_info(space_info, bytes, false);
        }
        return ret;
 }
@@ -1926,7 +1926,7 @@ __cold void btrfs_dump_space_info_for_trans_abort(struct btrfs_fs_info *fs_info)
        btrfs_info(fs_info, "dumping space info:");
        list_for_each_entry(space_info, &fs_info->space_info, list) {
                spin_lock(&space_info->lock);
-               __btrfs_dump_space_info(fs_info, space_info);
+               __btrfs_dump_space_info(space_info);
                spin_unlock(&space_info->lock);
        }
        dump_global_block_rsv(fs_info);

diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h
index 737e874a8c34bb7824c65e35bca4ab0e61350ebe..a88cf71b3d3a872fb4bdba6c49d91b854ebf42d5 100644 (file)
--- a/fs/btrfs/space-info.h
+++ b/fs/btrfs/space-info.h
@@ -276,8 +276,7 @@ struct btrfs_space_info *btrfs_find_space_info(struct btrfs_fs_info *info,
 u64 __pure btrfs_space_info_used(const struct btrfs_space_info *s_info,
                          bool may_use_included);
 void btrfs_clear_space_info_full(struct btrfs_fs_info *info);
-void btrfs_dump_space_info(struct btrfs_fs_info *fs_info,
-                          struct btrfs_space_info *info, u64 bytes,
+void btrfs_dump_space_info(struct btrfs_space_info *info, u64 bytes,
                           bool dump_block_groups);
 int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
                                 struct btrfs_space_info *space_info,