From: David Sterba <dsterba@suse.com>
Date: Mon, 11 Apr 2016 16:40:08 +0000 (+0200)
Subject: btrfs: send: use vmalloc only as fallback for send_buf
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6ff48ce06b07255a6459cd8b816a110971a81f00;p=linux-beck.git

btrfs: send: use vmalloc only as fallback for send_buf

Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index ec433795fa71..b6e2c6ec4ee5 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -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);