]> git.hungrycats.org Git - linux/commitdiff
Revert "btrfs: rename need_do_async_reclaim"
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Wed, 9 Dec 2020 15:31:46 +0000 (10:31 -0500)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Wed, 9 Dec 2020 15:31:46 +0000 (10:31 -0500)
This reverts commit 86a58cb300b8a143058fed5cbf114ff9fbfaa223.

fs/btrfs/space-info.c

index 0a0bdee1c74df7f03cab4eb394e3e88b8a34cb01..e177484d4aeffa147e8830cdf29d8980562245b2 100644 (file)
@@ -796,9 +796,9 @@ btrfs_calc_reclaim_metadata_size(struct btrfs_fs_info *fs_info,
        return to_reclaim;
 }
 
-static inline bool need_preemptive_reclaim(struct btrfs_fs_info *fs_info,
-                                          struct btrfs_space_info *space_info,
-                                          u64 used)
+static inline int need_do_async_reclaim(struct btrfs_fs_info *fs_info,
+                                       struct btrfs_space_info *space_info,
+                                       u64 used)
 {
        u64 thresh = div_factor_fine(space_info->total_bytes, 98);
 
@@ -1016,7 +1016,7 @@ static void btrfs_preempt_reclaim_metadata_space(struct work_struct *work)
 
        spin_lock(&space_info->lock);
        used = btrfs_space_info_used(space_info, true);
-       while (need_preemptive_reclaim(fs_info, space_info, used)) {
+       while (need_do_async_reclaim(fs_info, space_info, used)) {
                enum btrfs_flush_state flush;
                u64 delalloc_size = 0;
                u64 to_reclaim, block_rsv_size;
@@ -1462,7 +1462,7 @@ static int __reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
                 * the async reclaim as we will panic.
                 */
                if (!test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags) &&
-                   need_preemptive_reclaim(fs_info, space_info, used) &&
+                   need_do_async_reclaim(fs_info, space_info, used) &&
                    !work_busy(&fs_info->preempt_reclaim_work)) {
                        trace_btrfs_trigger_flush(fs_info, space_info->flags,
                                                  orig_bytes, flush, "preempt");