diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /fs/xattr_acl.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
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) | |||
| 36 | if (count == 0) | 36 | if (count == 0) |
| 37 | return NULL; | 37 | return NULL; |
| 38 | 38 | ||
| 39 | acl = posix_acl_alloc(count, GFP_KERNEL); | 39 | acl = posix_acl_alloc(count, GFP_NOFS); |
| 40 | if (!acl) | 40 | if (!acl) |
| 41 | return ERR_PTR(-ENOMEM); | 41 | return ERR_PTR(-ENOMEM); |
| 42 | acl_e = acl->a_entries; | 42 | acl_e = acl->a_entries; |