- partial 3.10 update

[packages/kernel.git] / ovl02-vfs-export-do_splice_direct-to-modules.patch

diff --git a/ovl02-vfs-export-do_splice_direct-to-modules.patch b/ovl02-vfs-export-do_splice_direct-to-modules.patch
index 312baea345b29ae56ff1d2153e9de20ff7f6a28e..5667bb02a0adcaf39724e2c3f6bc647ffee76c92 100644 (file)
--- a/ovl02-vfs-export-do_splice_direct-to-modules.patch
+++ b/ovl02-vfs-export-do_splice_direct-to-modules.patch
@@ -8,14 +8,14 @@ Export do_splice_direct() to modules.  Needed by overlay filesystem.
 
 Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
 ---
- fs/splice.c |    1 +
- 1 file changed, 1 insertion(+)
+ fs/internal.h      |    6 ------
+ fs/splice.c        |    1 +
+ include/linux/fs.h |    3 +++
+ 3 files changed, 4 insertions(+), 6 deletions(-)
 
-Index: linux-3.6-rc7-master/fs/splice.c
-===================================================================
---- linux-3.6-rc7-master.orig/fs/splice.c      2012-09-24 03:10:57.000000000 +0200
-+++ linux-3.6-rc7-master/fs/splice.c   2012-09-28 13:36:49.000000000 +0200
-@@ -1308,6 +1308,7 @@ long do_splice_direct(struct file *in, l
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1312,6 +1312,7 @@ long do_splice_direct(struct file *in, l
  
        return ret;
  }
@@ -23,3 +23,30 @@ Index: linux-3.6-rc7-master/fs/splice.c
  
  static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,
                               struct pipe_inode_info *opipe,
+--- a/fs/internal.h
++++ b/fs/internal.h
+@@ -132,12 +132,6 @@ extern struct dentry *__d_alloc(struct s
+ extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *);
+ 
+ /*
+- * splice.c
+- */
+-extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
+-              loff_t *opos, size_t len, unsigned int flags);
+-
+-/*
+  * pipe.c
+  */
+ extern const struct file_operations pipefifo_fops;
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -2427,6 +2427,9 @@ extern ssize_t generic_file_splice_write
+               struct file *, loff_t *, size_t, unsigned int);
+ extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe,
+               struct file *out, loff_t *, size_t len, unsigned int flags);
++extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
++              loff_t *opos, size_t len, unsigned int flags);
++
+ 
+ extern void
+ file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);