btrfs: remove fs_info argument from btrfs_try_granting_tickets()

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 8bf501fbcc0bef4b8c3a19f4f6fe98f42e6d7bb1..035b04e7658d16720bb9216d5f6fb8b4ace2ede8 100644 (file)
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -3836,7 +3836,7 @@ int btrfs_add_reserved_bytes(struct btrfs_block_group *cache,
         * that happens.
         */
        if (num_bytes < ram_bytes)
-               btrfs_try_granting_tickets(cache->fs_info, space_info);
+               btrfs_try_granting_tickets(space_info);
 out:
        spin_unlock(&cache->lock);
        spin_unlock(&space_info->lock);
@@ -3874,7 +3874,7 @@ void btrfs_free_reserved_bytes(struct btrfs_block_group *cache, u64 num_bytes,
                cache->delalloc_bytes -= num_bytes;
        spin_unlock(&cache->lock);
 
-       btrfs_try_granting_tickets(cache->fs_info, space_info);
+       btrfs_try_granting_tickets(space_info);
        spin_unlock(&space_info->lock);
 }
 

diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c
index 5ad6de738aee014687c4dab9f3cb0422e36b2680..75cd35570a287b06fa4701479f5469c16f304c32 100644 (file)
--- a/fs/btrfs/block-rsv.c
+++ b/fs/btrfs/block-rsv.c
@@ -387,7 +387,7 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info)
                num_bytes = block_rsv->reserved - block_rsv->size;
                btrfs_space_info_update_bytes_may_use(sinfo, -num_bytes);
                block_rsv->reserved = block_rsv->size;
-               btrfs_try_granting_tickets(fs_info, sinfo);
+               btrfs_try_granting_tickets(sinfo);
        }
 
        block_rsv->full = (block_rsv->reserved == block_rsv->size);

diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index 85c466c85910ace7c9cfd10beae92b17bde2ae74..869641e42f2f4ff9e47340d286a91ce27ce5410f 100644 (file)
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -373,7 +373,7 @@ void btrfs_add_bg_to_space_info(struct btrfs_fs_info *info,
        btrfs_space_info_update_bytes_zone_unusable(space_info, block_group->zone_unusable);
        if (block_group->length > 0)
                space_info->full = false;
-       btrfs_try_granting_tickets(info, space_info);
+       btrfs_try_granting_tickets(space_info);
        spin_unlock(&space_info->lock);
 
        block_group->space_info = space_info;
@@ -523,9 +523,9 @@ static void remove_ticket(struct btrfs_space_info *space_info,
  * This is for space we already have accounted in space_info->bytes_may_use, so
  * basically when we're returning space from block_rsv's.
  */
-void btrfs_try_granting_tickets(struct btrfs_fs_info *fs_info,
-                               struct btrfs_space_info *space_info)
+void btrfs_try_granting_tickets(struct btrfs_space_info *space_info)
 {
+       struct btrfs_fs_info *fs_info = space_info->fs_info;
        struct list_head *head;
        enum btrfs_reserve_flush_enum flush = BTRFS_RESERVE_NO_FLUSH;
 
@@ -1124,7 +1124,7 @@ static bool maybe_fail_all_tickets(struct btrfs_fs_info *fs_info,
                 * the list.
                 */
                if (!aborted)
-                       btrfs_try_granting_tickets(fs_info, space_info);
+                       btrfs_try_granting_tickets(space_info);
        }
        return (tickets_id != space_info->tickets_id);
 }
@@ -1544,7 +1544,7 @@ static void priority_reclaim_metadata_space(struct btrfs_fs_info *fs_info,
         * ticket in front of a smaller ticket that can now be satisfied with
         * the available space.
         */
-       btrfs_try_granting_tickets(fs_info, space_info);
+       btrfs_try_granting_tickets(space_info);
        spin_unlock(&space_info->lock);
 }
 
@@ -1572,7 +1572,7 @@ static void priority_reclaim_data_space(struct btrfs_fs_info *fs_info,
 
        ticket->error = -ENOSPC;
        remove_ticket(space_info, ticket);
-       btrfs_try_granting_tickets(fs_info, space_info);
+       btrfs_try_granting_tickets(space_info);
        spin_unlock(&space_info->lock);
 }
 
@@ -2195,5 +2195,5 @@ void btrfs_return_free_space(struct btrfs_space_info *space_info, u64 len)
 grant:
        /* Add to any tickets we may have. */
        if (len)
-               btrfs_try_granting_tickets(fs_info, space_info);
+               btrfs_try_granting_tickets(space_info);
 }

diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h
index a846f63585c95007ecd72c2aab1029c999c1a95e..596a1e923ddfe97e24830d8d388a7733ecc94186 100644 (file)
--- a/fs/btrfs/space-info.h
+++ b/fs/btrfs/space-info.h
@@ -283,8 +283,7 @@ int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
                                 struct btrfs_space_info *space_info,
                                 u64 orig_bytes,
                                 enum btrfs_reserve_flush_enum flush);
-void btrfs_try_granting_tickets(struct btrfs_fs_info *fs_info,
-                               struct btrfs_space_info *space_info);
+void btrfs_try_granting_tickets(struct btrfs_space_info *space_info);
 int btrfs_can_overcommit(struct btrfs_fs_info *fs_info,
                         const struct btrfs_space_info *space_info, u64 bytes,
                         enum btrfs_reserve_flush_enum flush);
@@ -295,7 +294,7 @@ static inline void btrfs_space_info_free_bytes_may_use(
 {
        spin_lock(&space_info->lock);
        btrfs_space_info_update_bytes_may_use(space_info, -num_bytes);
-       btrfs_try_granting_tickets(space_info->fs_info, space_info);
+       btrfs_try_granting_tickets(space_info);
        spin_unlock(&space_info->lock);
 }
 int btrfs_reserve_data_bytes(struct btrfs_space_info *space_info, u64 bytes,