btrfs: send: use vmalloc only as fallback for read_buf

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-04-11 18:40:08 +02:00
parent 6ff48ce06b
commit eb5b75fe2e
1 changed files with 7 additions and 4 deletions

View File

@ -6037,10 +6037,13 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
}
}
sctx->read_buf = vmalloc(BTRFS_SEND_READ_SIZE);
sctx->read_buf = kmalloc(BTRFS_SEND_READ_SIZE, GFP_KERNEL | __GFP_NOWARN);
if (!sctx->read_buf) {
ret = -ENOMEM;
goto out;
sctx->read_buf = vmalloc(BTRFS_SEND_READ_SIZE);
if (!sctx->read_buf) {
ret = -ENOMEM;
goto out;
}
}
sctx->pending_dir_moves = RB_ROOT;
@ -6224,7 +6227,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
vfree(sctx->clone_roots);
kvfree(sctx->send_buf);
vfree(sctx->read_buf);
kvfree(sctx->read_buf);
name_cache_free(sctx);