Commit e7dc95db authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

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

grp_goal 0 is a genuine goal (unlike -1), so ext4_try_to_allocate_with_rsv
should treat it as such.
Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cd16c8f7
...@@ -1288,7 +1288,7 @@ ext4_try_to_allocate_with_rsv(struct super_block *sb, handle_t *handle, ...@@ -1288,7 +1288,7 @@ ext4_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 < EXT4_BLOCKS_PER_GROUP(sb) * 0 <= grp_goal < EXT4_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
*/ */
...@@ -1324,7 +1324,7 @@ ext4_try_to_allocate_with_rsv(struct super_block *sb, handle_t *handle, ...@@ -1324,7 +1324,7 @@ ext4_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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment