fix backport of fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch

diff --git a/queue-4.14/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch b/queue-4.14/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
index 357c26bd7b0bcc37cbccf02cdfcdbecfd21b249d..b95f20c8ebd73fc4bb4588590f36ae07692184cf 100644 (file)
--- a/queue-4.14/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
+++ b/queue-4.14/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
@@ -23,8 +23,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  fs/pipe.c                 |    4 ++--
  fs/splice.c               |   12 ++++++++++--
  include/linux/pipe_fs_i.h |   10 ++++++----
- kernel/trace/trace.c      |    4 ++++
- 5 files changed, 28 insertions(+), 14 deletions(-)
+ kernel/trace/trace.c      |    6 +++++-
+ 5 files changed, 29 insertions(+), 15 deletions(-)
 
 --- a/fs/fuse/dev.c
 +++ b/fs/fuse/dev.c
@@ -144,7 +144,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  int generic_pipe_buf_nosteal(struct pipe_inode_info *, struct pipe_buffer *);
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -6744,7 +6744,11 @@ static void buffer_pipe_buf_get(struct p
+@@ -6739,12 +6739,16 @@ static void buffer_pipe_buf_release(stru
+       buf->private = 0;
+ }
+ 
+-static void buffer_pipe_buf_get(struct pipe_inode_info *pipe,
++static bool buffer_pipe_buf_get(struct pipe_inode_info *pipe,
+                               struct pipe_buffer *buf)
  {
        struct buffer_ref *ref = (struct buffer_ref *)buf->private;
  

diff --git a/queue-4.19/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch b/queue-4.19/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
index 98fcf7fb04d473b38347bd005a051e959361491b..742bd38d29ed732c3502c248cb7c1c73a2dc2f40 100644 (file)
--- a/queue-4.19/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
+++ b/queue-4.19/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
@@ -23,8 +23,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  fs/pipe.c                 |    4 ++--
  fs/splice.c               |   12 ++++++++++--
  include/linux/pipe_fs_i.h |   10 ++++++----
- kernel/trace/trace.c      |    4 ++++
- 5 files changed, 28 insertions(+), 14 deletions(-)
+ kernel/trace/trace.c      |    6 +++++-
+ 5 files changed, 29 insertions(+), 15 deletions(-)
 
 --- a/fs/fuse/dev.c
 +++ b/fs/fuse/dev.c
@@ -144,7 +144,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  int generic_pipe_buf_nosteal(struct pipe_inode_info *, struct pipe_buffer *);
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -6828,7 +6828,11 @@ static void buffer_pipe_buf_get(struct p
+@@ -6823,12 +6823,16 @@ static void buffer_pipe_buf_release(stru
+       buf->private = 0;
+ }
+ 
+-static void buffer_pipe_buf_get(struct pipe_inode_info *pipe,
++static bool buffer_pipe_buf_get(struct pipe_inode_info *pipe,
+                               struct pipe_buffer *buf)
  {
        struct buffer_ref *ref = (struct buffer_ref *)buf->private;
  

diff --git a/queue-5.0/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch b/queue-5.0/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
index b8869b70c86ef9e2e6cbb11887041be3cb4c9202..3a9e328a7dbbc49d649399db8ac99222c34a7190 100644 (file)
--- a/queue-5.0/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
+++ b/queue-5.0/fs-prevent-page-refcount-overflow-in-pipe_buf_get.patch
@@ -23,8 +23,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  fs/pipe.c                 |    4 ++--
  fs/splice.c               |   12 ++++++++++--
  include/linux/pipe_fs_i.h |   10 ++++++----
- kernel/trace/trace.c      |    4 ++++
- 5 files changed, 28 insertions(+), 14 deletions(-)
+ kernel/trace/trace.c      |    6 +++++-
+ 5 files changed, 29 insertions(+), 15 deletions(-)
 
 --- a/fs/fuse/dev.c
 +++ b/fs/fuse/dev.c
@@ -144,7 +144,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  int generic_pipe_buf_nosteal(struct pipe_inode_info *, struct pipe_buffer *);
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -6848,7 +6848,11 @@ static void buffer_pipe_buf_get(struct p
+@@ -6843,12 +6843,16 @@ static void buffer_pipe_buf_release(stru
+       buf->private = 0;
+ }
+ 
+-static void buffer_pipe_buf_get(struct pipe_inode_info *pipe,
++static bool buffer_pipe_buf_get(struct pipe_inode_info *pipe,
+                               struct pipe_buffer *buf)
  {
        struct buffer_ref *ref = (struct buffer_ref *)buf->private;