Commit 3a710532 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus_fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull missed ext4 fix from Ted Ts'o:
 "Fix an potential unitialzied variable bug; this was a fixup that I had
  forgotten to apply before the last pull request for ext4. My bad"

* tag 'ext4_for_linus_fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fixup possible uninitialized variable access in ext4_mb_choose_next_group_cr1()
parents f76349cf a078dff8

fs/ext4/mballoc.c

+1 −2
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ static void ext4_mb_choose_next_group_cr1(struct ext4_allocation_context *ac, 
		int *new_cr, ext4_group_t *group, ext4_group_t ngroups)

{

	struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);

	struct ext4_group_info *grp, *iter;

	struct ext4_group_info *grp = NULL, *iter;

	int i;



	if (unlikely(ac->ac_flags & EXT4_MB_CR1_OPTIMIZED)) {
@@ -927,7 +927,6 @@ static void ext4_mb_choose_next_group_cr1(struct ext4_allocation_context *ac, 
			read_unlock(&sbi->s_mb_avg_fragment_size_locks[i]);

			continue;

		}

		grp = NULL;

		list_for_each_entry(iter, &sbi->s_mb_avg_fragment_size[i],

				    bb_avg_fragment_size_node) {

			if (sbi->s_mb_stats)