|
@@ -1353,7 +1353,8 @@ release_path:
|
|
|
total_done++;
|
|
|
|
|
|
btrfs_release_prepared_delayed_node(delayed_node);
|
|
|
- if (async_work->nr == 0 || total_done < async_work->nr)
|
|
|
+ if ((async_work->nr == 0 && total_done < BTRFS_DELAYED_WRITEBACK) ||
|
|
|
+ total_done < async_work->nr)
|
|
|
goto again;
|
|
|
|
|
|
free_path:
|
|
@@ -1369,7 +1370,8 @@ static int btrfs_wq_run_delayed_node(struct btrfs_delayed_root *delayed_root,
|
|
|
{
|
|
|
struct btrfs_async_delayed_work *async_work;
|
|
|
|
|
|
- if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND)
|
|
|
+ if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND ||
|
|
|
+ btrfs_workqueue_normal_congested(fs_info->delayed_workers))
|
|
|
return 0;
|
|
|
|
|
|
async_work = kmalloc(sizeof(*async_work), GFP_NOFS);
|