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

2006-11-28 Thread Mingming Cao

--
Subject: ext2 balloc: fix off-by-one against grp_goal
From: Hugh Dickins <[EMAIL PROTECTED]>

grp_goal 0 is a genuine goal (unlike -1), so ext2_try_to_allocate_with_rsv
should treat it as such.
--

Sync up with ext2 reservation fix  in ext3

Signed-off-by: Mingming Cao <[EMAIL PROTECTED]>
---


---

 linux-2.6.19-rc5-cmm/fs/ext3/balloc.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN fs/ext3/balloc.c~ext3-balloc-fix-off-by-one-against-grp_goal 
fs/ext3/balloc.c
--- 
linux-2.6.19-rc5/fs/ext3/balloc.c~ext3-balloc-fix-off-by-one-against-grp_goal   
2006-11-28 19:36:48.0 -0800
+++ linux-2.6.19-rc5-cmm/fs/ext3/balloc.c   2006-11-28 19:36:48.0 
-0800
@@ -1271,7 +1271,7 @@ ext3_try_to_allocate_with_rsv(struct sup
}
/*
 * 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 sup
if (!goal_in_my_reservation(_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;
 

_


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


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

2006-11-28 Thread Mingming Cao

--
Subject: ext2 balloc: fix off-by-one against grp_goal
From: Hugh Dickins [EMAIL PROTECTED]

grp_goal 0 is a genuine goal (unlike -1), so ext2_try_to_allocate_with_rsv
should treat it as such.
--

Sync up with ext2 reservation fix  in ext3

Signed-off-by: Mingming Cao [EMAIL PROTECTED]
---


---

 linux-2.6.19-rc5-cmm/fs/ext3/balloc.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN fs/ext3/balloc.c~ext3-balloc-fix-off-by-one-against-grp_goal 
fs/ext3/balloc.c
--- 
linux-2.6.19-rc5/fs/ext3/balloc.c~ext3-balloc-fix-off-by-one-against-grp_goal   
2006-11-28 19:36:48.0 -0800
+++ linux-2.6.19-rc5-cmm/fs/ext3/balloc.c   2006-11-28 19:36:48.0 
-0800
@@ -1271,7 +1271,7 @@ ext3_try_to_allocate_with_rsv(struct sup
}
/*
 * 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 sup
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;
 

_


-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/