Merge branch 'dev/gfp-flags' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
This commit is contained in:
commit
13d5d15d63
|
@ -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);
|
||||
|
@ -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;
|
||||
|
|
|
@ -97,7 +97,7 @@ static struct __btrfs_workqueue *
|
|||
__btrfs_alloc_workqueue(const char *name, unsigned int flags, int limit_active,
|
||||
int thresh)
|
||||
{
|
||||
struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS);
|
||||
struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_KERNEL);
|
||||
|
||||
if (!ret)
|
||||
return NULL;
|
||||
|
@ -148,7 +148,7 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,
|
|||
int limit_active,
|
||||
int thresh)
|
||||
{
|
||||
struct btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS);
|
||||
struct btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_KERNEL);
|
||||
|
||||
if (!ret)
|
||||
return NULL;
|
||||
|
|
|
@ -4147,7 +4147,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
|
|||
return -ENOMEM;
|
||||
|
||||
space_args.total_spaces = 0;
|
||||
dest = kmalloc(alloc_size, GFP_NOFS);
|
||||
dest = kmalloc(alloc_size, GFP_KERNEL);
|
||||
if (!dest)
|
||||
return -ENOMEM;
|
||||
dest_orig = dest;
|
||||
|
@ -4673,7 +4673,7 @@ locked:
|
|||
goto out_bargs;
|
||||
}
|
||||
|
||||
bctl = kzalloc(sizeof(*bctl), GFP_NOFS);
|
||||
bctl = kzalloc(sizeof(*bctl), GFP_KERNEL);
|
||||
if (!bctl) {
|
||||
ret = -ENOMEM;
|
||||
goto out_bargs;
|
||||
|
@ -4759,7 +4759,7 @@ static long btrfs_ioctl_balance_progress(struct btrfs_root *root,
|
|||
goto out;
|
||||
}
|
||||
|
||||
bargs = kzalloc(sizeof(*bargs), GFP_NOFS);
|
||||
bargs = kzalloc(sizeof(*bargs), GFP_KERNEL);
|
||||
if (!bargs) {
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
|
@ -5019,7 +5019,7 @@ static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg)
|
|||
if (!capable(CAP_SYS_ADMIN))
|
||||
return -EPERM;
|
||||
|
||||
qsa = kzalloc(sizeof(*qsa), GFP_NOFS);
|
||||
qsa = kzalloc(sizeof(*qsa), GFP_KERNEL);
|
||||
if (!qsa)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -5149,7 +5149,7 @@ static long btrfs_ioctl_set_received_subvol_32(struct file *file,
|
|||
goto out;
|
||||
}
|
||||
|
||||
args64 = kmalloc(sizeof(*args64), GFP_NOFS);
|
||||
args64 = kmalloc(sizeof(*args64), GFP_KERNEL);
|
||||
if (!args64) {
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue