diff options
| author | Russell King | 2009-12-06 18:00:33 +0100 |
|---|---|---|
| committer | Russell King | 2009-12-06 18:00:33 +0100 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /fs/xattr_acl.c | |
| parent | Merge branch 'devel-stable' into devel (diff) | |
| parent | Fix soc_common PCMCIA configuration (diff) | |
| download | kernel-qcow2-linux-3d14b5beba35250c548d3851a2b84fce742d8311.tar.gz kernel-qcow2-linux-3d14b5beba35250c548d3851a2b84fce742d8311.tar.xz kernel-qcow2-linux-3d14b5beba35250c548d3851a2b84fce742d8311.zip | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'fs/xattr_acl.c')
| -rw-r--r-- | fs/xattr_acl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c index c6ad7c7e3ee9..05ac0fe9c4d3 100644 --- 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; |