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 clone_roots
X-Git-Tag: v4.14-rc1~2972^2~15^2~3^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c03d01f3404282712b9fd280297f133860c91c93;p=platform%2Fkernel%2Flinux-rpi.git

btrfs: send: use vmalloc only as fallback for clone_roots

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

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 4f85a47..5a5d37b 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -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 @@ out:
 		if (sctx->send_filp)
 			fput(sctx->send_filp);
 
-		vfree(sctx->clone_roots);
+		kvfree(sctx->clone_roots);
 		kvfree(sctx->send_buf);
 		kvfree(sctx->read_buf);