From 0a7320f1df485e2dcaf9df4825db06ec9981938d Mon Sep 17 00:00:00 2001
From: Mingming Cao <cmm@us.ibm.com>
Date: Wed, 6 Dec 2006 20:38:19 -0800
Subject: [PATCH] --- yaml --- r: 42865 b: refs/heads/master c:
 1df1e63b9e9340015c01b85817568fb9afde10bc h: refs/heads/master i:   42863:
 c97d96726d60f5f6c5819dd14c6c4c5abf39d352 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ext4/balloc.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7f689c153b41..235e4ff9d40d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bd94bd79e5bfa217714f78e5d6d7b6517ca546f
+refs/heads/master: 1df1e63b9e9340015c01b85817568fb9afde10bc
diff --git a/trunk/fs/ext4/balloc.c b/trunk/fs/ext4/balloc.c
index 5d45582f9517..6bd0bd5bbdc8 100644
--- a/trunk/fs/ext4/balloc.c
+++ b/trunk/fs/ext4/balloc.c
@@ -1324,10 +1324,14 @@ ext4_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 &&
-			  (my_rsv->rsv_end-grp_goal+1) < *count)
-			try_to_extend_reservation(my_rsv, sb,
-					*count-my_rsv->rsv_end + grp_goal - 1);
+		} else if (grp_goal > 0) {
+			int curr = my_rsv->rsv_end -
+					(grp_goal + group_first_block) + 1;
+
+			if (curr < *count)
+				try_to_extend_reservation(my_rsv, sb,
+							*count - curr);
+		}
 
 		if ((my_rsv->rsv_start > group_last_block) ||
 				(my_rsv->rsv_end < group_first_block)) {