From 945111e94e9f51f7d007960960296676fb1a8282 Mon Sep 17 00:00:00 2001 From: Khazhismel Kumykov Date: Thu, 25 Apr 2019 12:58:01 -0400 Subject: [PATCH 0406/2944] ext4: cond_resched in work-heavy group loops commit 4b99faa23c51ca31312b9afb876e8e5878daeb80 upstream. Signed-off-by: Khazhismel Kumykov Signed-off-by: Theodore Ts'o Reviewed-by: Andreas Dilger Signed-off-by: Joseph Qi Reviewed-by: Xiaoguang Wang Acked-by: Caspar Zhang --- fs/ext4/block_validity.c | 1 + fs/ext4/mballoc.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c index 7edc817..d4d4fdf 100644 --- a/fs/ext4/block_validity.c +++ b/fs/ext4/block_validity.c @@ -272,6 +272,7 @@ int ext4_setup_system_zone(struct super_block *sb) return -ENOMEM; for (i=0; i < ngroups; i++) { + cond_resched(); if (ext4_bg_has_super(sb, i) && ((i < 5) || ((i % flex_size) == 0))) add_system_zone(system_blks, diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 8ef5f12..99ba720 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2490,6 +2490,7 @@ static int ext4_mb_init_backend(struct super_block *sb) sbi->s_buddy_cache->i_ino = EXT4_BAD_INO; EXT4_I(sbi->s_buddy_cache)->i_disksize = 0; for (i = 0; i < ngroups; i++) { + cond_resched(); desc = ext4_get_group_desc(sb, i, NULL); if (desc == NULL) { ext4_msg(sb, KERN_ERR, "can't read descriptor %u", i); @@ -2705,6 +2706,7 @@ int ext4_mb_release(struct super_block *sb) if (sbi->s_group_info) { for (i = 0; i < ngroups; i++) { + cond_resched(); grinfo = ext4_get_group_info(sb, i); #ifdef DOUBLE_CHECK kfree(grinfo->bb_bitmap); -- 1.8.3.1