From 7139b98f29396f219517bc76d132237cc270cc44 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 11 Jul 2006 09:50:54 -0400
Subject: [PATCH] --- yaml --- r: 38745 b: refs/heads/master c:
 f3bba03fd16e25a262323293e5a07dea173c89f7 h: refs/heads/master i:   38743:
 dac322ff6f5e4de4080869cba69943da8ccdf1af v: v3

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

diff --git a/[refs] b/[refs]
index 94d4b013b943..0f075bfb4569 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4340fe62531f7d1dafb6f5359ffe0378bdb0db80
+refs/heads/master: f3bba03fd16e25a262323293e5a07dea173c89f7
diff --git a/trunk/fs/gfs2/meta_io.c b/trunk/fs/gfs2/meta_io.c
index cad44fd70d67..42dfd32059bc 100644
--- a/trunk/fs/gfs2/meta_io.c
+++ b/trunk/fs/gfs2/meta_io.c
@@ -75,7 +75,7 @@ struct inode *gfs2_aspace_get(struct gfs2_sbd *sdp)
 
 	aspace = new_inode(sdp->sd_vfs);
 	if (aspace) {
-		mapping_set_gfp_mask(aspace->i_mapping, GFP_KERNEL);
+		mapping_set_gfp_mask(aspace->i_mapping, GFP_NOFS);
 		aspace->i_mapping->a_ops = &aspace_aops;
 		aspace->i_size = ~0ULL;
 		aspace->u.generic_ip = NULL;