From 24f52ae7ebc388ead97e73261f9c5debcf5899fc Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Wed, 8 Aug 2007 17:08:14 -0500
Subject: [PATCH] --- yaml --- r: 67658 b: refs/heads/master c:
 75be73a8246ef96f7fa3f05a6a1450159fbb7a64 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b68733efc7e4..0fd387eb8989 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f3eae7546093d845ca8ada1b95714202a136a1a
+refs/heads/master: 75be73a8246ef96f7fa3f05a6a1450159fbb7a64
diff --git a/trunk/fs/gfs2/ops_fstype.c b/trunk/fs/gfs2/ops_fstype.c
index 58c730be2073..f0bcaa25737c 100644
--- a/trunk/fs/gfs2/ops_fstype.c
+++ b/trunk/fs/gfs2/ops_fstype.c
@@ -358,7 +358,7 @@ static int init_journal(struct gfs2_sbd *sdp, int undo)
 
 		ip = GFS2_I(sdp->sd_jdesc->jd_inode);
 		error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED,
-					   LM_FLAG_NOEXP | GL_EXACT,
+					   LM_FLAG_NOEXP | GL_EXACT | GL_NOCACHE,
 					   &sdp->sd_jinode_gh);
 		if (error) {
 			fs_err(sdp, "can't acquire journal inode glock: %d\n",
diff --git a/trunk/fs/gfs2/recovery.c b/trunk/fs/gfs2/recovery.c
index 5ada38c99a2c..beb6c7ac0086 100644
--- a/trunk/fs/gfs2/recovery.c
+++ b/trunk/fs/gfs2/recovery.c
@@ -469,7 +469,7 @@ int gfs2_recover_journal(struct gfs2_jdesc *jd)
 		};
 
 		error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED,
-					   LM_FLAG_NOEXP, &ji_gh);
+					   LM_FLAG_NOEXP | GL_NOCACHE, &ji_gh);
 		if (error)
 			goto fail_gunlock_j;
 	} else {