From 17f3d8a4cd7038e596e9621f4dadc49dfa06888c Mon Sep 17 00:00:00 2001
From: Abhijith Das <adas@redhat.com>
Date: Fri, 21 Jul 2006 02:03:21 -0400
Subject: [PATCH] --- yaml --- r: 38757 b: refs/heads/master c:
 52f341cf75d2da84811127582616984eb0602360 h: refs/heads/master i:   38755:
 02afb93be9c2594cdb640c8ec7bb7d2fe29ea9e8 v: v3

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

diff --git a/[refs] b/[refs]
index 77b863a8e42f..99f22cf89d27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5921fd02e6c720938141a45f1f9dbd71b17fff2
+refs/heads/master: 52f341cf75d2da84811127582616984eb0602360
diff --git a/trunk/fs/gfs2/ops_file.c b/trunk/fs/gfs2/ops_file.c
index 26f1d3249b0f..6764ca69bc52 100644
--- a/trunk/fs/gfs2/ops_file.c
+++ b/trunk/fs/gfs2/ops_file.c
@@ -608,12 +608,9 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
 	int error;
 	u32 new_flags, flags;
 
-	gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
 	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
-	if (error) {
-		gfs2_holder_uninit(&gh);
+	if (error)
 		return error;
-	}
 
 	flags = ip->i_di.di_flags;
 	new_flags = (flags & ~mask) | (reqflags & mask);