summaryrefslogtreecommitdiffstats
path: root/fs/ext4/ialloc.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-08-26 07:45:37 +0200
committerH. Peter Anvin <hpa@zytor.com>2008-08-26 07:45:37 +0200
commit94d4ac2f4a58c6e37876827c6688c61cef21290c (patch)
tree732f4e4794f3c116041242f69754637f75c0dd57 /fs/ext4/ialloc.c
parentx86: cleanup in amd_cpu_notify() (diff)
parentx86: msr: fix bogus return values from rdmsr_safe/wrmsr_safe (diff)
downloadlinux-94d4ac2f4a58c6e37876827c6688c61cef21290c.tar.xz
linux-94d4ac2f4a58c6e37876827c6688c61cef21290c.zip
Merge branch 'x86/urgent' into x86/cleanups
Diffstat (limited to 'fs/ext4/ialloc.c')
-rw-r--r--fs/ext4/ialloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 655e760212b8..f344834bbf58 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -351,7 +351,7 @@ find_close_to_parent:
goto found_flexbg;
}
- if (best_flex < 0 ||
+ if (flex_group[best_flex].free_inodes == 0 ||
(flex_group[i].free_blocks >
flex_group[best_flex].free_blocks &&
flex_group[i].free_inodes))