From c74f7ebd28db9a47647f1fb43319065b0be51e8c Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 4 Apr 2012 11:08:51 +0200
Subject: [PATCH] --- yaml --- r: 309281 b: refs/heads/master c:
 bd1a68b59c8e3bce45fb76632c64e1e063c3962d h: refs/heads/master i:   309279:
 a2f79ef5c8a7f13ed102f34033bed5a9619a422e v: v3

---
 [refs]            | 2 +-
 trunk/fs/splice.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e7d4c25b74ec..a773b04c8937 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a637120e49021d197e9578cba545bbaa459cbb51
+refs/heads/master: bd1a68b59c8e3bce45fb76632c64e1e063c3962d
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
index 5f883de7ef3a..5417aa320dc7 100644
--- a/trunk/fs/splice.c
+++ b/trunk/fs/splice.c
@@ -1385,7 +1385,7 @@ static long do_splice(struct file *in, loff_t __user *off_in,
  */
 static int get_iovec_page_array(const struct iovec __user *iov,
 				unsigned int nr_vecs, struct page **pages,
-				struct partial_page *partial, int aligned,
+				struct partial_page *partial, bool aligned,
 				unsigned int pipe_buffers)
 {
 	int buffers = 0, error = 0;
@@ -1623,7 +1623,7 @@ static long vmsplice_to_pipe(struct file *file, const struct iovec __user *iov,
 		return -ENOMEM;
 
 	spd.nr_pages = get_iovec_page_array(iov, nr_segs, spd.pages,
-					    spd.partial, flags & SPLICE_F_GIFT,
+					    spd.partial, false,
 					    pipe->buffers);
 	if (spd.nr_pages <= 0)
 		ret = spd.nr_pages;