Merge git://git.infradead.org/ubifs-2.6

[karo-tx-linux.git] / fs / xattr_acl.c

diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
index c6ad7c7e3ee9eaa58c4a7994c316f4f4a24fd45a..05ac0fe9c4d3cb7e62dab0510c398e5e026935eb 100644 (file)
--- a/fs/xattr_acl.c
+++ b/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;