openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: send: use vmalloc only as fallback for clone_roots 

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-04-11 18:40:08 +02:00
parent e55d1153db
commit c03d01f340
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/btrfs/send.c
View File

@ -6053,10 +6053,13 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
alloc_size = sizeof(struct clone_root) * (arg->clone_sources_count + 1);
sctx->clone_roots = vzalloc(alloc_size);
sctx->clone_roots = kzalloc(alloc_size, GFP_KERNEL | __GFP_NOWARN);
if (!sctx->clone_roots) {
ret = -ENOMEM;
goto out;
sctx->clone_roots = vzalloc(alloc_size);
if (!sctx->clone_roots) {
ret = -ENOMEM;
goto out;
}
}
alloc_size = arg->clone_sources_count * sizeof(*arg->clone_sources);
@ -6227,7 +6230,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
if (sctx->send_filp)
fput(sctx->send_filp);
vfree(sctx->clone_roots);
kvfree(sctx->clone_roots);
kvfree(sctx->send_buf);
kvfree(sctx->read_buf);