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);