From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 17 Jul 2007 09:29:02 +0000 (+0100)
Subject: [GFS2] Fix incorrect error path in prepare_write()
X-Git-Tag: v2.6.23-rc4~135^2~2
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=a867bb28c1cb49ae86d034d8bd8fe6dbcbb19566;p=safe%2Fjmp%2Flinux-2.6

[GFS2] Fix incorrect error path in prepare_write()

The error path in prepare_write() was incorrect in the (very rare) event
that the transaction fails to start. The following prevents a NULL
pointer dereference,

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---

diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
index ce90032..42a5f58 100644
--- a/fs/gfs2/ops_address.c
+++ b/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 @@ prepare_write:
 out:
 	if (error) {
 		gfs2_trans_end(sdp);
+out_trans_fail:
 		if (alloc_required) {
 			gfs2_inplace_release(ip);
 out_qunlock: