From 094b96558749be4a82f61aa2b38daca1fe7c631e Mon Sep 17 00:00:00 2001 From: Yongqiang Yang Date: Sun, 23 Sep 2012 23:10:51 -0400 Subject: [PATCH] --- yaml --- r: 331593 b: refs/heads/master c: 838cd0cf9af52e034ee81513642083bbe8e4ddb1 h: refs/heads/master i: 331591: f2f6a285778afcb968d05f0e3e40b152a9f6b585 v: v3 --- [refs] | 2 +- trunk/fs/ext4/mballoc.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 51db00884bf5..9df4c9549253 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50df9fd55e4271e89a7adf3b1172083dd0ca199d +refs/heads/master: 838cd0cf9af52e034ee81513642083bbe8e4ddb1 diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c index 2c7c082b8169..bb821a924049 100644 --- a/trunk/fs/ext4/mballoc.c +++ b/trunk/fs/ext4/mballoc.c @@ -1660,10 +1660,13 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac, int max; int err; struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); + struct ext4_group_info *grp = ext4_get_group_info(ac->ac_sb, group); struct ext4_free_extent ex; if (!(ac->ac_flags & EXT4_MB_HINT_TRY_GOAL)) return 0; + if (grp->bb_free == 0) + return 0; err = ext4_mb_load_buddy(ac->ac_sb, group, e4b); if (err)