FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-17 14:30:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] ext3 balloc: fix off-by-one against grp_goal

Browse Source 
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>
This commit is contained in:
Hugh Dickins 2006-12-06 20:41:25 -08:00 committed by Linus Torvalds
parent ef5036782e
commit 1650242324
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ext3/balloc.c
View File

@ -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) * 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 a filesystem wide block number
* first block is the block number of the first block in this group * 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, if (!goal_in_my_reservation(&my_rsv->rsv_window,
grp_goal, group, sb)) grp_goal, group, sb))
grp_goal = -1; grp_goal = -1;
} else if (grp_goal > 0) { } else if (grp_goal >= 0) {
int curr = my_rsv->rsv_end - int curr = my_rsv->rsv_end -
(grp_goal + group_first_block) + 1; (grp_goal + group_first_block) + 1;