1 files changed, 9 insertions, 9 deletions

diff --git a/fs/splice.c b/fs/splice.c
index 1ec0493266b3..406ef2b792c2 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -25,11 +25,12 @@
 #include <linux/mm_inline.h>
 #include <linux/swap.h>
 #include <linux/writeback.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/syscalls.h>
 #include <linux/uio.h>
 #include <linux/security.h>
 #include <linux/gfp.h>
+#include <linux/socket.h>
 
 /*
  * Attempt to steal a page from a pipe buffer. This should perhaps go into
@@ -690,7 +691,9 @@ static int pipe_to_sendpage(struct pipe_inode_info *pipe,
         if (!likely(file->f_op && file->f_op->sendpage))
                 return -EINVAL;
 
-        more = (sd->flags & SPLICE_F_MORE) || sd->len < sd->total_len;
+        more = (sd->flags & SPLICE_F_MORE) ? MSG_MORE : 0;
+        if (sd->len < sd->total_len)
+                more |= MSG_SENDPAGE_NOTLAST;
         return file->f_op->sendpage(file, buf->page, buf->offset,
                                     sd->len, &pos, more);
 }
@@ -737,15 +740,12 @@ int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
                 goto out;
 
         if (buf->page != page) {
-                /*
-                 * Careful, ->map() uses KM_USER0!
-                 */
                 char *src = buf->ops->map(pipe, buf, 1);
-                char *dst = kmap_atomic(page, KM_USER1);
+                char *dst = kmap_atomic(page);
 
                 memcpy(dst + offset, src + buf->offset, this_len);
                 flush_dcache_page(page);
-                kunmap_atomic(dst, KM_USER1);
+                kunmap_atomic(dst);
                 buf->ops->unmap(pipe, buf, src);
         }
         ret = pagecache_write_end(file, mapping, sd->pos, this_len, this_len,
@@ -1388,7 +1388,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;
@@ -1626,7 +1626,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;