From 2e5afef109edbf7faf43f01136856af7a5906733 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 15 Nov 2006 15:17:03 -0500
Subject: [PATCH] --- yaml --- r: 43291 b: refs/heads/master c:
 ab923031ceb95ec50ef33ccadf28663c660aa94c h: refs/heads/master i:   43289:
 765b3485ea878fc34e9d40c01d88ea1dced0ba2b   43287:
 6a3be6c92626b07dec5d486277f0086bebc698e6 v: v3

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

diff --git a/[refs] b/[refs]
index ab6dd908057b..ed33778edd4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b98c95af01c10827e3443157651eb469071391a3
+refs/heads/master: ab923031ceb95ec50ef33ccadf28663c660aa94c
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
index 746347a404c4..edc21c8d7faa 100644
--- a/trunk/fs/gfs2/glock.c
+++ b/trunk/fs/gfs2/glock.c
@@ -769,7 +769,7 @@ static void handle_callback(struct gfs2_glock *gl, unsigned int state)
 	} else {
 		spin_unlock(&gl->gl_spin);
 
-		new_gh = gfs2_holder_get(gl, state, LM_FLAG_TRY, GFP_KERNEL);
+		new_gh = gfs2_holder_get(gl, state, LM_FLAG_TRY, GFP_NOFS);
 		if (!new_gh)
 			return;
 		set_bit(HIF_DEMOTE, &new_gh->gh_iflags);