summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhazhismel Kumykov <khazhy@google.com>2019-04-25 12:58:01 -0400
committerTheodore Ts'o <tytso@mit.edu>2019-04-25 12:58:01 -0400
commit4b99faa23c51ca31312b9afb876e8e5878daeb80 (patch)
tree962f554d6556f2a6e5391a31783124d00b01c84c
parent7bc04c5c2cc467c5b40f2b03ba08da174a0d5fa7 (diff)
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>
-rw-r--r--fs/ext4/block_validity.c1
-rw-r--r--fs/ext4/mballoc.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c
index 9409b1e11a22..968f163b5feb 100644
--- 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)
197 return 0; 197 return 0;
198 198
199 for (i=0; i < ngroups; i++) { 199 for (i=0; i < ngroups; i++) {
200 cond_resched();
200 if (ext4_bg_has_super(sb, i) && 201 if (ext4_bg_has_super(sb, i) &&
201 ((i < 5) || ((i % flex_size) == 0))) 202 ((i < 5) || ((i % flex_size) == 0)))
202 add_system_zone(sbi, ext4_group_first_block_no(sb, i), 203 add_system_zone(sbi, ext4_group_first_block_no(sb, i),
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 8ef5f12bbee2..99ba720dbb7a 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)
2490 sbi->s_buddy_cache->i_ino = EXT4_BAD_INO; 2490 sbi->s_buddy_cache->i_ino = EXT4_BAD_INO;
2491 EXT4_I(sbi->s_buddy_cache)->i_disksize = 0; 2491 EXT4_I(sbi->s_buddy_cache)->i_disksize = 0;
2492 for (i = 0; i < ngroups; i++) { 2492 for (i = 0; i < ngroups; i++) {
2493 cond_resched();
2493 desc = ext4_get_group_desc(sb, i, NULL); 2494 desc = ext4_get_group_desc(sb, i, NULL);
2494 if (desc == NULL) { 2495 if (desc == NULL) {
2495 ext4_msg(sb, KERN_ERR, "can't read descriptor %u", i); 2496 ext4_msg(sb, KERN_ERR, "can't read descriptor %u", i);
@@ -2705,6 +2706,7 @@ int ext4_mb_release(struct super_block *sb)
2705 2706
2706 if (sbi->s_group_info) { 2707 if (sbi->s_group_info) {
2707 for (i = 0; i < ngroups; i++) { 2708 for (i = 0; i < ngroups; i++) {
2709 cond_resched();
2708 grinfo = ext4_get_group_info(sb, i); 2710 grinfo = ext4_get_group_info(sb, i);
2709#ifdef DOUBLE_CHECK 2711#ifdef DOUBLE_CHECK
2710 kfree(grinfo->bb_bitmap); 2712 kfree(grinfo->bb_bitmap);