btrfs: remove fs_info argument from btrfs_can_overcommit()

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 035b04e7658d16720bb9216d5f6fb8b4ace2ede8..4eceba0ff4e0fb5e5a0efe11320ed3487cb5957e 100644 (file)
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -1403,8 +1403,7 @@ static int inc_block_group_ro(struct btrfs_block_group *cache, bool force)
                 * BTRFS_RESERVE_NO_FLUSH to give ourselves the most amount of
                 * leeway to allow us to mark this block group as read only.
                 */
-               if (btrfs_can_overcommit(cache->fs_info, sinfo, num_bytes,
-                                        BTRFS_RESERVE_NO_FLUSH))
+               if (btrfs_can_overcommit(sinfo, num_bytes, BTRFS_RESERVE_NO_FLUSH))
                        ret = 0;
        }
 

diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index 97e5007c78ed259cec95ffd252b4bacecf26627a..599d6cce9e7761062db42af4abac8294904e039c 100644 (file)
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -490,8 +490,7 @@ static u64 calc_available_free_space(const struct btrfs_space_info *space_info,
        return avail;
 }
 
-int btrfs_can_overcommit(struct btrfs_fs_info *fs_info,
-                        const struct btrfs_space_info *space_info, u64 bytes,
+int btrfs_can_overcommit(const struct btrfs_space_info *space_info, u64 bytes,
                         enum btrfs_reserve_flush_enum flush)
 {
        u64 avail;
@@ -525,7 +524,6 @@ static void remove_ticket(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;
 
@@ -541,8 +539,7 @@ again:
 
                /* Check and see if our ticket can be satisfied now. */
                if ((used + ticket->bytes <= space_info->total_bytes) ||
-                   btrfs_can_overcommit(fs_info, space_info, ticket->bytes,
-                                        flush)) {
+                   btrfs_can_overcommit(space_info, ticket->bytes, flush)) {
                        btrfs_space_info_update_bytes_may_use(space_info, ticket->bytes);
                        remove_ticket(space_info, ticket);
                        ticket->bytes = 0;
@@ -1775,7 +1772,7 @@ static int __reserve_bytes(struct btrfs_fs_info *fs_info,
         */
        if (!pending_tickets &&
            ((used + orig_bytes <= space_info->total_bytes) ||
-            btrfs_can_overcommit(fs_info, space_info, orig_bytes, flush))) {
+            btrfs_can_overcommit(space_info, orig_bytes, flush))) {
                btrfs_space_info_update_bytes_may_use(space_info, orig_bytes);
                ret = 0;
        }

diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h
index 596a1e923ddfe97e24830d8d388a7733ecc94186..737e874a8c34bb7824c65e35bca4ab0e61350ebe 100644 (file)
--- a/fs/btrfs/space-info.h
+++ b/fs/btrfs/space-info.h
@@ -284,8 +284,7 @@ int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
                                 u64 orig_bytes,
                                 enum btrfs_reserve_flush_enum flush);
 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,
+int btrfs_can_overcommit(const struct btrfs_space_info *space_info, u64 bytes,
                         enum btrfs_reserve_flush_enum flush);
 
 static inline void btrfs_space_info_free_bytes_may_use(