Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16502423 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

[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: 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 ef503678

fs/ext3/balloc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;