From beb9306b57fec47ec7a8701747ff3c973a41c106 Mon Sep 17 00:00:00 2001
From: Chris Sykes <chris@sigsegv.plus.com>
Date: Tue, 27 Sep 2005 21:45:23 -0700
Subject: [PATCH] --- yaml --- r: 9381 b: refs/heads/master c:
 dc7b5fd6b0d3beb41f9e5e3a94dd1eadf52209f3 h: refs/heads/master i:   9379:
 545dcd3fabd0156510d67847a5f7e21fc4175576 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ext3/ialloc.c | 29 ++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 6d8e0125d62b..1ecdf482ee4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ed6c2fb34a1fb493caec8a9644d05bb880a6923
+refs/heads/master: dc7b5fd6b0d3beb41f9e5e3a94dd1eadf52209f3
diff --git a/trunk/fs/ext3/ialloc.c b/trunk/fs/ext3/ialloc.c
index 96552769d039..6549945f9ac1 100644
--- a/trunk/fs/ext3/ialloc.c
+++ b/trunk/fs/ext3/ialloc.c
@@ -597,27 +597,22 @@ struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, int mode)
 
 	ret = inode;
 	if(DQUOT_ALLOC_INODE(inode)) {
-		DQUOT_DROP(inode);
 		err = -EDQUOT;
-		goto fail2;
+		goto fail_drop;
 	}
+
 	err = ext3_init_acl(handle, inode, dir);
-	if (err) {
-		DQUOT_FREE_INODE(inode);
-		DQUOT_DROP(inode);
-		goto fail2;
-  	}
+	if (err)
+		goto fail_free_drop;
+
 	err = ext3_init_security(handle,inode, dir);
-	if (err) {
-		DQUOT_FREE_INODE(inode);
-		goto fail2;
-	}
+	if (err)
+		goto fail_free_drop;
+
 	err = ext3_mark_inode_dirty(handle, inode);
 	if (err) {
 		ext3_std_error(sb, err);
-		DQUOT_FREE_INODE(inode);
-		DQUOT_DROP(inode);
-		goto fail2;
+		goto fail_free_drop;
 	}
 
 	ext3_debug("allocating inode %lu\n", inode->i_ino);
@@ -631,7 +626,11 @@ struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, int mode)
 	brelse(bitmap_bh);
 	return ret;
 
-fail2:
+fail_free_drop:
+	DQUOT_FREE_INODE(inode);
+
+fail_drop:
+	DQUOT_DROP(inode);
 	inode->i_flags |= S_NOQUOTA;
 	inode->i_nlink = 0;
 	iput(inode);