From de3c6fcc4bcd3c43a3096ec8b01e4999adac5735 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 7 Feb 2007 10:25:59 -0500
Subject: [PATCH] --- yaml --- r: 46323 b: refs/heads/master c:
 2d72e7101cc7fff5c1eb21bfcbba51c8002418d2 h: refs/heads/master i:   46321:
 9be06ec2337ae88d99a3bb40c8a721e228fa79eb   46319:
 3952ec12678a1d86dc07e7c26351cbba32c4926c v: v3

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

diff --git a/[refs] b/[refs]
index ebb8ec832741..c6d7f4a33480 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 549ae0ac3d574a682e82b02e79259a65445a675b
+refs/heads/master: 2d72e7101cc7fff5c1eb21bfcbba51c8002418d2
diff --git a/trunk/fs/gfs2/ops_address.c b/trunk/fs/gfs2/ops_address.c
index 9ddf9753a552..5e9653c4d886 100644
--- a/trunk/fs/gfs2/ops_address.c
+++ b/trunk/fs/gfs2/ops_address.c
@@ -360,8 +360,10 @@ static int gfs2_prepare_write(struct file *file, struct page *page,
 	gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME|LM_FLAG_TRY_1CB, &ip->i_gh);
 	error = gfs2_glock_nq_atime(&ip->i_gh);
 	if (unlikely(error)) {
-		if (error == GLR_TRYFAILED)
+		if (error == GLR_TRYFAILED) {
+			unlock_page(page);
 			error = AOP_TRUNCATED_PAGE;
+		}
 		goto out_uninit;
 	}