diff options
| author | Khazhismel Kumykov <khazhy@google.com> | 2019-04-25 18:58:01 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-04-25 18:58:01 +0200 |
| commit | 4b99faa23c51ca31312b9afb876e8e5878daeb80 (patch) | |
| tree | 962f554d6556f2a6e5391a31783124d00b01c84c /fs/ext4 | |
| parent | ext4: fix use-after-free race with debug_want_extra_isize (diff) | |
| download | linux-4b99faa23c51ca31312b9afb876e8e5878daeb80.tar.xz linux-4b99faa23c51ca31312b9afb876e8e5878daeb80.zip | |
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>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/block_validity.c | 1 | ||||
| -rw-r--r-- | fs/ext4/mballoc.c | 2 |
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) 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 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) 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); |