Merge branch 'page-refs' (page ref overflow)

[sfrench/cifs-2.6.git] / fs / splice.c

diff --git a/fs/splice.c b/fs/splice.c
index f30af82b850dd339056de3e2ca62dcb1ad121458..98943d9b219c0cea1037770cbc6578970fbe69b6 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -138,7 +138,6 @@ error:
 }
 
 const struct pipe_buf_operations page_cache_pipe_buf_ops = {
-       .can_merge = 0,
        .confirm = page_cache_pipe_buf_confirm,
        .release = page_cache_pipe_buf_release,
        .steal = page_cache_pipe_buf_steal,
@@ -156,7 +155,6 @@ static int user_page_pipe_buf_steal(struct pipe_inode_info *pipe,
 }
 
 static const struct pipe_buf_operations user_page_pipe_buf_ops = {
-       .can_merge = 0,
        .confirm = generic_pipe_buf_confirm,
        .release = page_cache_pipe_buf_release,
        .steal = user_page_pipe_buf_steal,
@@ -326,7 +324,6 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos,
 EXPORT_SYMBOL(generic_file_splice_read);
 
 const struct pipe_buf_operations default_pipe_buf_ops = {
-       .can_merge = 0,
        .confirm = generic_pipe_buf_confirm,
        .release = generic_pipe_buf_release,
        .steal = generic_pipe_buf_steal,
@@ -341,7 +338,6 @@ static int generic_pipe_buf_nosteal(struct pipe_inode_info *pipe,
 
 /* Pipe buffer operations for a socket and similar. */
 const struct pipe_buf_operations nosteal_pipe_buf_ops = {
-       .can_merge = 0,
        .confirm = generic_pipe_buf_confirm,
        .release = generic_pipe_buf_release,
        .steal = generic_pipe_buf_nosteal,
@@ -357,7 +353,7 @@ static ssize_t kernel_readv(struct file *file, const struct kvec *vec,
        ssize_t res;
 
        old_fs = get_fs();
-       set_fs(get_ds());
+       set_fs(KERNEL_DS);
        /* The cast to a user pointer is valid due to the set_fs() */
        res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos, 0);
        set_fs(old_fs);
@@ -1123,6 +1119,9 @@ static long do_splice(struct file *in, loff_t __user *off_in,
                if (ipipe == opipe)
                        return -EINVAL;
 
+               if ((in->f_flags | out->f_flags) & O_NONBLOCK)
+                       flags |= SPLICE_F_NONBLOCK;
+
                return splice_pipe_to_pipe(ipipe, opipe, len, flags);
        }
 
@@ -1148,6 +1147,9 @@ static long do_splice(struct file *in, loff_t __user *off_in,
                if (unlikely(ret < 0))
                        return ret;
 
+               if (in->f_flags & O_NONBLOCK)
+                       flags |= SPLICE_F_NONBLOCK;
+
                file_start_write(out);
                ret = do_splice_from(ipipe, out, &offset, len, flags);
                file_end_write(out);
@@ -1172,6 +1174,9 @@ static long do_splice(struct file *in, loff_t __user *off_in,
                        offset = in->f_pos;
                }
 
+               if (out->f_flags & O_NONBLOCK)
+                       flags |= SPLICE_F_NONBLOCK;
+
                pipe_lock(opipe);
                ret = wait_for_space(opipe, flags);
                if (!ret)
@@ -1601,6 +1606,8 @@ retry:
                         */
                        obuf->flags &= ~PIPE_BUF_FLAG_GIFT;
 
+                       pipe_buf_mark_unmergeable(obuf);
+
                        obuf->len = len;
                        opipe->nrbufs++;
                        ibuf->offset += obuf->len;
@@ -1679,6 +1686,8 @@ static int link_pipe(struct pipe_inode_info *ipipe,
                 */
                obuf->flags &= ~PIPE_BUF_FLAG_GIFT;
 
+               pipe_buf_mark_unmergeable(obuf);
+
                if (obuf->len > len)
                        obuf->len = len;
 
@@ -1725,6 +1734,9 @@ static long do_tee(struct file *in, struct file *out, size_t len,
         * copying the data.
         */
        if (ipipe && opipe && ipipe != opipe) {
+               if ((in->f_flags | out->f_flags) & O_NONBLOCK)
+                       flags |= SPLICE_F_NONBLOCK;
+
                /*
                 * Keep going, unless we encounter an error. The ipipe/opipe
                 * ordering doesn't really matter.