]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
btrfs: send: use vmalloc only as fallback for send_buf
authorDavid Sterba <dsterba@suse.com>
Mon, 11 Apr 2016 16:40:08 +0000 (18:40 +0200)
committerDavid Sterba <dsterba@suse.com>
Fri, 6 May 2016 13:22:49 +0000 (15:22 +0200)
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/send.c

index ec433795fa71ad7f3fd052584ebaa2bbcc2a8e7f..b6e2c6ec4ee5a7e9c44363584c872b2547b80f6a 100644 (file)
@@ -6028,10 +6028,13 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
        sctx->clone_roots_cnt = arg->clone_sources_count;
 
        sctx->send_max_size = BTRFS_SEND_BUF_SIZE;
-       sctx->send_buf = vmalloc(sctx->send_max_size);
+       sctx->send_buf = kmalloc(sctx->send_max_size, GFP_KERNEL | __GFP_NOWARN);
        if (!sctx->send_buf) {
-               ret = -ENOMEM;
-               goto out;
+               sctx->send_buf = vmalloc(sctx->send_max_size);
+               if (!sctx->send_buf) {
+                       ret = -ENOMEM;
+                       goto out;
+               }
        }
 
        sctx->read_buf = vmalloc(BTRFS_SEND_READ_SIZE);
@@ -6220,7 +6223,7 @@ out:
                        fput(sctx->send_filp);
 
                vfree(sctx->clone_roots);
-               vfree(sctx->send_buf);
+               kvfree(sctx->send_buf);
                vfree(sctx->read_buf);
 
                name_cache_free(sctx);