From d4bb8bf6fa7755924a98f883e58261cde8785e55 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 17 Jul 2007 10:29:02 +0100
Subject: [PATCH] --- yaml --- r: 64026 b: refs/heads/master c:
 a867bb28c1cb49ae86d034d8bd8fe6dbcbb19566 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/fs/gfs2/ops_address.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2e570adb46a7..8f71995285cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6eefaf61f664053c1dd6534a994cab3f8bb07263
+refs/heads/master: a867bb28c1cb49ae86d034d8bd8fe6dbcbb19566
diff --git a/trunk/fs/gfs2/ops_address.c b/trunk/fs/gfs2/ops_address.c
index ce90032c010e..42a5f58f6fca 100644
--- a/trunk/fs/gfs2/ops_address.c
+++ b/trunk/fs/gfs2/ops_address.c
@@ -416,7 +416,7 @@ static int gfs2_prepare_write(struct file *file, struct page *page,
 
 	error = gfs2_trans_begin(sdp, rblocks, 0);
 	if (error)
-		goto out;
+		goto out_trans_fail;
 
 	if (gfs2_is_stuffed(ip)) {
 		if (end > sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode)) {
@@ -434,6 +434,7 @@ static int gfs2_prepare_write(struct file *file, struct page *page,
 out:
 	if (error) {
 		gfs2_trans_end(sdp);
+out_trans_fail:
 		if (alloc_required) {
 			gfs2_inplace_release(ip);
 out_qunlock: