summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2006-12-07 04:41:25 (GMT)
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 16:39:48 (GMT)
commit1650242324a0c19d629a8be0d5a8ecdc174d31f8 (patch)
treeede667fcb170d58750794b5b1f7baade4d0ba552 /fs
parentef5036782e619ab394daaec5c00876fa6b17d7a1 (diff)
downloadlinux-1650242324a0c19d629a8be0d5a8ecdc174d31f8.tar.xz
[PATCH] ext3 balloc: fix off-by-one against grp_goal
grp_goal 0 is a genuine goal (unlike -1), so ext3_try_to_allocate_with_rsv should treat it as such. Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: Hugh Dickins <hugh@veritas.com> Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext3/balloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index db8ca34..0706a45 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -1271,7 +1271,7 @@ ext3_try_to_allocate_with_rsv(struct super_block *sb, handle_t *handle,
}
/*
* grp_goal is a group relative block number (if there is a goal)
- * 0 < grp_goal < EXT3_BLOCKS_PER_GROUP(sb)
+ * 0 <= grp_goal < EXT3_BLOCKS_PER_GROUP(sb)
* first block is a filesystem wide block number
* first block is the block number of the first block in this group
*/
@@ -1307,7 +1307,7 @@ ext3_try_to_allocate_with_rsv(struct super_block *sb, handle_t *handle,
if (!goal_in_my_reservation(&my_rsv->rsv_window,
grp_goal, group, sb))
grp_goal = -1;
- } else if (grp_goal > 0) {
+ } else if (grp_goal >= 0) {
int curr = my_rsv->rsv_end -
(grp_goal + group_first_block) + 1;