From bed6afe8ff3f18d04143336340e8d147e96f0423 Mon Sep 17 00:00:00 2001
From: Mingming Cao <cmm@us.ibm.com>
Date: Sun, 27 Aug 2006 01:23:44 -0700
Subject: [PATCH] --- yaml --- r: 33638 b: refs/heads/master c:
 08fb306fe63d98eb86e3b16f4cc21816fa47f18e h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ext3/balloc.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 63a71cedfd26..9743d843a815 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 607eb266aea9dd2abe515985e12c5cd8b32546e8
+refs/heads/master: 08fb306fe63d98eb86e3b16f4cc21816fa47f18e
diff --git a/trunk/fs/ext3/balloc.c b/trunk/fs/ext3/balloc.c
index a504a40d6d29..063d994bda0b 100644
--- a/trunk/fs/ext3/balloc.c
+++ b/trunk/fs/ext3/balloc.c
@@ -1269,12 +1269,12 @@ ext3_fsblk_t ext3_new_blocks(handle_t *handle, struct inode *inode,
 		goal = le32_to_cpu(es->s_first_data_block);
 	group_no = (goal - le32_to_cpu(es->s_first_data_block)) /
 			EXT3_BLOCKS_PER_GROUP(sb);
+	goal_group = group_no;
+retry_alloc:
 	gdp = ext3_get_group_desc(sb, group_no, &gdp_bh);
 	if (!gdp)
 		goto io_error;
 
-	goal_group = group_no;
-retry:
 	free_blocks = le16_to_cpu(gdp->bg_free_blocks_count);
 	/*
 	 * if there is not enough free blocks to make a new resevation
@@ -1349,7 +1349,7 @@ ext3_fsblk_t ext3_new_blocks(handle_t *handle, struct inode *inode,
 	if (my_rsv) {
 		my_rsv = NULL;
 		group_no = goal_group;
-		goto retry;
+		goto retry_alloc;
 	}
 	/* No space left on the device */
 	*errp = -ENOSPC;