Skip to content

Commit

Permalink
btrfs: use GFP_KERNEL for xattr and acl allocations
Browse files Browse the repository at this point in the history
We don't have to use GFP_NOFS in context of ACL or XATTR actions, not
possible to loop through the allocator and it's safe to fail with
ENOMEM.

Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
David Sterba committed Dec 3, 2015
1 parent 61dd5ae commit 39a27ec
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions fs/btrfs/acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type)

size = __btrfs_getxattr(inode, name, "", 0);
if (size > 0) {
value = kzalloc(size, GFP_NOFS);
value = kzalloc(size, GFP_KERNEL);
if (!value)
return ERR_PTR(-ENOMEM);
size = __btrfs_getxattr(inode, name, value, size);
Expand Down Expand Up @@ -102,7 +102,7 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,

if (acl) {
size = posix_acl_xattr_size(acl->a_count);
value = kmalloc(size, GFP_NOFS);
value = kmalloc(size, GFP_KERNEL);
if (!value) {
ret = -ENOMEM;
goto out;
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ static int btrfs_initxattrs(struct inode *inode,

for (xattr = xattr_array; xattr->name != NULL; xattr++) {
name = kmalloc(XATTR_SECURITY_PREFIX_LEN +
strlen(xattr->name) + 1, GFP_NOFS);
strlen(xattr->name) + 1, GFP_KERNEL);
if (!name) {
err = -ENOMEM;
break;
Expand Down

0 comments on commit 39a27ec

Please sign in to comment.