X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=blobdiff_plain;f=fs%2Fxattr_acl.c;h=8d5a506c82eb0a16978c4b8065011b412dace2a6;hp=c6ad7c7e3ee9eaa58c4a7994c316f4f4a24fd45a;hb=b2e75eff5e859d0c294e7405958362b26a423c6e;hpb=cd354f1ae75e6466a7e31b727faede57a1f89ca5

diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
index c6ad7c7..8d5a506 100644
--- a/fs/xattr_acl.c
+++ b/fs/xattr_acl.c
@@ -6,9 +6,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/posix_acl_xattr.h>
+#include <linux/gfp.h>
 
 
 /*
@@ -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;