Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.com>2017-06-19 13:10:07 +0200
committerJiri Kosina <jkosina@suse.cz>2017-06-19 13:35:24 +0200
commitfa1fcfd11b039bc91a7a4bba4d42e1b4d53262a7 (patch)
tree4af05ef79dd3334b29d8f301ab77b0d1cff4e6ec
parent122e5af097af98776179a0336ab91228cff1f4de (diff)
Refresh 0001-splice-Stub-splice_write_to_file.patch to make genksymsrpm-3.0.101-104
happy Copy the original declaration from <linux/splice.h> verbatim. Also, move the patch to patches.kabi.
-rw-r--r--patches.kabi/0001-splice-Stub-splice_write_to_file.patch (renamed from patches.fixes/0001-splice-Stub-splice_write_to_file.patch)14
-rw-r--r--series.conf2
2 files changed, 7 insertions, 9 deletions
diff --git a/patches.fixes/0001-splice-Stub-splice_write_to_file.patch b/patches.kabi/0001-splice-Stub-splice_write_to_file.patch
index 3bd2867a10..da5df82a08 100644
--- a/patches.fixes/0001-splice-Stub-splice_write_to_file.patch
+++ b/patches.kabi/0001-splice-Stub-splice_write_to_file.patch
@@ -9,20 +9,21 @@ This is needed to appease the SLE11-SP4 symset grouping
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
- fs/splice.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ fs/splice.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
-diff --git a/fs/splice.c b/fs/splice.c
-index 372da4f30255..c80f2bc4b58a 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -979,6 +979,20 @@ ssize_t splice_from_pipe(struct pipe_inode_info *pipe, struct file *out,
+@@ -979,6 +979,23 @@ ssize_t splice_from_pipe(struct pipe_ino
return ret;
}
+typedef ssize_t (splice_write_actor)(struct pipe_inode_info *,
+ struct splice_desc *);
+
++extern ssize_t splice_write_to_file(struct pipe_inode_info *, struct file *,
++ loff_t *, size_t, unsigned int,
++ splice_write_actor *);
+
+ssize_t
+splice_write_to_file(struct pipe_inode_info *pipe, struct file *out,
@@ -37,6 +38,3 @@ index 372da4f30255..c80f2bc4b58a 100644
/**
* generic_file_splice_write - splice data from a pipe to a file
* @pipe: pipe info
---
-2.7.4
-
diff --git a/series.conf b/series.conf
index 31aac1fda5..93cc97de73 100644
--- a/series.conf
+++ b/series.conf
@@ -4850,7 +4850,7 @@
patches.fixes/xfs-don-t-assert-fail-on-non-async-buffers-on-ioacct-decrement.patch
patches.kabi/kabi-Protect-xfs_mount-and-xfs_buftarg.patch
- patches.fixes/0001-splice-Stub-splice_write_to_file.patch
+ patches.kabi/0001-splice-Stub-splice_write_to_file.patch
########################################################
# ceph backport from 3.5-rc1