diff options
| author | David Sterba <dsterba@suse.com> | 2016-04-11 18:40:08 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-06 15:22:49 +0200 |
| commit | 153519559a39725c5a45269256fec0efb81bcd1f (patch) | |
| tree | 4de43f1350274283e71298873de315da6fbe3ac2 /fs/btrfs/ioctl.c | |
| parent | 2f91306a37809907474a06c1defdb1ff50be06f0 (diff) | |
| download | op-kernel-dev-153519559a39725c5a45269256fec0efb81bcd1f.zip op-kernel-dev-153519559a39725c5a45269256fec0efb81bcd1f.tar.gz | |
btrfs: clone: use vmalloc only as fallback for nodesize bufer
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index f545f81..cfa7d47 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3468,13 +3468,16 @@ static int btrfs_clone(struct inode *src, struct inode *inode, u64 last_dest_end = destoff; ret = -ENOMEM; - buf = vmalloc(root->nodesize); - if (!buf) - return ret; + buf = kmalloc(root->nodesize, GFP_KERNEL | __GFP_NOWARN); + if (!buf) { + buf = vmalloc(root->nodesize); + if (!buf) + return ret; + } path = btrfs_alloc_path(); if (!path) { - vfree(buf); + kvfree(buf); return ret; } @@ -3775,7 +3778,7 @@ process_slot: out: btrfs_free_path(path); - vfree(buf); + kvfree(buf); return ret; } |
