btrfs: remove fs_info argument from maybe_fail_all_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/space-info.c b/fs/btrfs/space-info.c
index bd902e38929e8cc19a6b371b9c52ee0d14c91a8f..8d3459b9f8dddcd66b83638a7197b950cf20420f 100644 (file)
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -1071,7 +1071,6 @@ static bool steal_from_global_rsv(struct btrfs_fs_info *fs_info,
 /*
  * We've exhausted our flushing, start failing tickets.
  *
- * @fs_info - fs_info for this fs
  * @space_info - the space info we were flushing
  *
  * We call this when we've exhausted our flushing ability and haven't made
@@ -1084,9 +1083,9 @@ static bool steal_from_global_rsv(struct btrfs_fs_info *fs_info,
  * other tickets, or if it stumbles across a ticket that was smaller than the
  * first ticket.
  */
-static bool maybe_fail_all_tickets(struct btrfs_fs_info *fs_info,
-                                  struct btrfs_space_info *space_info)
+static bool maybe_fail_all_tickets(struct btrfs_space_info *space_info)
 {
+       struct btrfs_fs_info *fs_info = space_info->fs_info;
        struct reserve_ticket *ticket;
        u64 tickets_id = space_info->tickets_id;
        const bool aborted = BTRFS_FS_ERROR(fs_info);
@@ -1197,7 +1196,7 @@ static void do_async_reclaim_metadata_space(struct btrfs_space_info *space_info)
                if (flush_state > final_state) {
                        commit_cycles++;
                        if (commit_cycles > 2) {
-                               if (maybe_fail_all_tickets(fs_info, space_info)) {
+                               if (maybe_fail_all_tickets(space_info)) {
                                        flush_state = FLUSH_DELAYED_ITEMS_NR;
                                        commit_cycles--;
                                } else {
@@ -1425,7 +1424,7 @@ static void do_async_reclaim_data_space(struct btrfs_space_info *space_info)
 
                if (flush_state >= ARRAY_SIZE(data_flush_states)) {
                        if (space_info->full) {
-                               if (maybe_fail_all_tickets(fs_info, space_info))
+                               if (maybe_fail_all_tickets(space_info))
                                        flush_state = 0;
                                else
                                        space_info->flush = false;
@@ -1443,7 +1442,7 @@ static void do_async_reclaim_data_space(struct btrfs_space_info *space_info)
        return;
 
 aborted_fs:
-       maybe_fail_all_tickets(fs_info, space_info);
+       maybe_fail_all_tickets(space_info);
        space_info->flush = false;
        spin_unlock(&space_info->lock);
 }