diff --git a/[refs] b/[refs] index 5397828c8c7c..67d8e9956614 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78944086663e6c1b03f3d60bf7610128149be5fc +refs/heads/master: 28739eea9cd42598b632972f5cc64a458c5d40b3 diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c index 38a11bf79329..396b01f5c4fb 100644 --- a/trunk/fs/ext4/mballoc.c +++ b/trunk/fs/ext4/mballoc.c @@ -4825,11 +4825,11 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group, "information for %u", group); return ret; } - bitmap = e4b.bd_bitmap; + + ext4_lock_group(sb, group); start = (e4b.bd_info->bb_first_free > start) ? e4b.bd_info->bb_first_free : start; - ext4_lock_group(sb, group); while (start < max) { start = mb_find_next_zero_bit(bitmap, max, start);