61 lines
1.9 KiB
Diff
61 lines
1.9 KiB
Diff
From bbe04b17053d192844389840b6b981cd98417517 Mon Sep 17 00:00:00 2001
|
|
From: Miklos Szeredi <mszeredi@suse.cz>
|
|
Date: Thu, 27 Jun 2013 16:39:49 +0200
|
|
Subject: [PATCH 2/9] vfs: export do_splice_direct() to modules
|
|
|
|
Export do_splice_direct() to modules. Needed by overlay filesystem.
|
|
|
|
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
|
|
---
|
|
fs/internal.h | 6 ------
|
|
fs/splice.c | 1 +
|
|
include/linux/fs.h | 3 +++
|
|
3 files changed, 4 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/fs/internal.h b/fs/internal.h
|
|
index 6812158..eaa75f7 100644
|
|
--- a/fs/internal.h
|
|
+++ b/fs/internal.h
|
|
@@ -132,12 +132,6 @@ extern struct dentry *__d_alloc(struct super_block *, const struct qstr *);
|
|
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;
|
|
diff --git a/fs/splice.c b/fs/splice.c
|
|
index 9eca476..8d415fc 100644
|
|
--- a/fs/splice.c
|
|
+++ b/fs/splice.c
|
|
@@ -1312,6 +1312,7 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
|
|
|
|
return ret;
|
|
}
|
|
+EXPORT_SYMBOL(do_splice_direct);
|
|
|
|
static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,
|
|
struct pipe_inode_info *opipe,
|
|
diff --git a/include/linux/fs.h b/include/linux/fs.h
|
|
index 0a87abc..80690b3 100644
|
|
--- a/include/linux/fs.h
|
|
+++ b/include/linux/fs.h
|
|
@@ -2416,6 +2416,9 @@ extern ssize_t generic_file_splice_write(struct pipe_inode_info *,
|
|
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);
|
|
--
|
|
1.8.3.2
|
|
|