Commit eb5b75fe authored by David Sterba's avatar David Sterba

btrfs: send: use vmalloc only as fallback for read_buf

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6ff48ce0
...@@ -6037,10 +6037,13 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) ...@@ -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) { if (!sctx->read_buf) {
ret = -ENOMEM; sctx->read_buf = vmalloc(BTRFS_SEND_READ_SIZE);
goto out; if (!sctx->read_buf) {
ret = -ENOMEM;
goto out;
}
} }
sctx->pending_dir_moves = RB_ROOT; sctx->pending_dir_moves = RB_ROOT;
...@@ -6224,7 +6227,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) ...@@ -6224,7 +6227,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
vfree(sctx->clone_roots); vfree(sctx->clone_roots);
kvfree(sctx->send_buf); kvfree(sctx->send_buf);
vfree(sctx->read_buf); kvfree(sctx->read_buf);
name_cache_free(sctx); name_cache_free(sctx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment