From b3aee54f231e860aa448fa2c4488aa154b60fb10 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Fri, 29 Jan 2010 15:48:57 +0000
Subject: [PATCH] --- yaml --- r: 180153 b: refs/heads/master c:
 ea8d62dadd0217334fb2c5d60e7f89e14076ca10 h: refs/heads/master i:   180151:
 0dd0c508970508eecc33905196ef6f03f3902711 v: v3

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

diff --git a/[refs] b/[refs]
index 8008eaffb237..439a4fe9731a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fe3ec6fe58d2bfe97fe7a5d731c29299a8ffd35
+refs/heads/master: ea8d62dadd0217334fb2c5d60e7f89e14076ca10
diff --git a/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c
index 46534a554cce..503b842f3ba2 100644
--- a/trunk/fs/gfs2/rgrp.c
+++ b/trunk/fs/gfs2/rgrp.c
@@ -911,7 +911,7 @@ void gfs2_rgrp_repolish_clones(struct gfs2_rgrpd *rgd)
 struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip)
 {
 	BUG_ON(ip->i_alloc != NULL);
-	ip->i_alloc = kzalloc(sizeof(struct gfs2_alloc), GFP_KERNEL);
+	ip->i_alloc = kzalloc(sizeof(struct gfs2_alloc), GFP_NOFS);
 	return ip->i_alloc;
 }