ext4: cond_resched in work-heavy group loops

Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>

diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c
index 9409b1e11a22ef168f42097c434d20db6b51982e..968f163b5febe0583fea3b2557dd0efec7266460 100644 (file)
--- a/fs/ext4/block_validity.c
+++ b/fs/ext4/block_validity.c
@@ -197,6 +197,7 @@ int ext4_setup_system_zone(struct super_block *sb)
                return 0;
 
        for (i=0; i < ngroups; i++) {
+               cond_resched();
                if (ext4_bg_has_super(sb, i) &&
                    ((i < 5) || ((i % flex_size) == 0)))
                        add_system_zone(sbi, ext4_group_first_block_no(sb, i),

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 8ef5f12bbee2a44f54680e9e3dd49a75dc816bb8..99ba720dbb7af0655962255645f7dd7543a51b53 100644 (file)
--- 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);