From 193e090819eedd7b60ff5f074887648eb4c55719 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 29 Sep 2009 16:31:03 +0100
Subject: [PATCH] --- yaml --- r: 169186 b: refs/heads/master c:
 ab201832f75f58c8f5093436363f80ffa4a4c9a8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 894e3e6bbd96..90d480655c60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 106381bfba997b83b64f68f2210e154162fc38e6
+refs/heads/master: ab201832f75f58c8f5093436363f80ffa4a4c9a8
diff --git a/trunk/fs/xattr_acl.c b/trunk/fs/xattr_acl.c
index c6ad7c7e3ee9..05ac0fe9c4d3 100644
--- a/trunk/fs/xattr_acl.c
+++ b/trunk/fs/xattr_acl.c
@@ -36,7 +36,7 @@ posix_acl_from_xattr(const void *value, size_t size)
 	if (count == 0)
 		return NULL;
 	
-	acl = posix_acl_alloc(count, GFP_KERNEL);
+	acl = posix_acl_alloc(count, GFP_NOFS);
 	if (!acl)
 		return ERR_PTR(-ENOMEM);
 	acl_e = acl->a_entries;