Commit ed738ba7 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: check worker before need_preemptive_reclaim 



need_preemptive_reclaim() does some calculations, which aren't heavy,
but if we're already running preemptive reclaim there's no reason to do
them at all, so re-order the checks so that we don't do the calculation
if we're already doing reclaim.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 94358c35

fs/btrfs/space-info.c

+2 −2
Original line number Diff line number Diff line
@@ -1588,8 +1588,8 @@ static int __reserve_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) &&

		    !work_busy(&fs_info->preempt_reclaim_work)) {

		    !work_busy(&fs_info->preempt_reclaim_work) &&

		    need_preemptive_reclaim(fs_info, space_info)) {

			trace_btrfs_trigger_flush(fs_info, space_info->flags,

						  orig_bytes, flush, "preempt");

			queue_work(system_unbound_wq,