remove libdss from Makefile

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / fs / splice.c

diff --git a/fs/splice.c b/fs/splice.c
index f3084cce0ea6be94ad047a1bf07cdcf1cb3cf0f4..00d2f142dcf98381aa8fd7edd58a12b495b974fe 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1580,6 +1580,8 @@ retry:
                         */
                        obuf->flags &= ~PIPE_BUF_FLAG_GIFT;
 
+                       pipe_buf_mark_unmergeable(obuf);
+
                        obuf->len = len;
                        opipe->nrbufs++;
                        ibuf->offset += obuf->len;
@@ -1654,6 +1656,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;