From fe86f0fdfce0fe7e2de127e8310d3f75f3be95fa Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 11 Apr 2006 13:59:36 +0200 Subject: [PATCH] --- yaml --- r: 25615 b: refs/heads/master c: 88e6faefaeed40a162041d85689e94595756d4c3 h: refs/heads/master i: 25613: 7d33558acc21c7ca4de0726cd9f9ba757bc01798 25611: a8e377b842bf75d941867114819a2e5e63902333 25607: ed641835f5e8be1ea562ef24563ca3d3eda27fec 25599: e77db04c33e00d37243d60d2e82633e3bb5331ed v: v3 --- [refs] | 2 +- trunk/include/linux/fs.h | 13 ++++++++++--- trunk/net/socket.c | 4 ---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index dae89e5621c1..02610fd33d27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 341b446bc5aa36d1d5b8159c1e66716b5d89024d +refs/heads/master: 88e6faefaeed40a162041d85689e94595756d4c3 diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 9e8e2ee353b4..2a629fd88ef0 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -1611,10 +1611,17 @@ extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor extern void do_generic_mapping_read(struct address_space *mapping, struct file_ra_state *, struct file *, loff_t *, read_descriptor_t *, read_actor_t); -extern ssize_t generic_file_splice_read(struct file *, struct pipe_inode_info *, size_t, unsigned int); -extern ssize_t generic_file_splice_write(struct pipe_inode_info *, struct file *, size_t, unsigned int); + +/* fs/splice.c */ +extern ssize_t generic_file_splice_read(struct file *, + struct pipe_inode_info *, size_t, unsigned int); +extern ssize_t generic_file_splice_write(struct pipe_inode_info *, + struct file *, size_t, unsigned int); +extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe, + struct file *out, size_t len, unsigned int flags); extern long do_splice_direct(struct file *in, struct file *out, - size_t len, unsigned int flags); + size_t len, unsigned int flags); + extern void file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping); extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, diff --git a/trunk/net/socket.c b/trunk/net/socket.c index b807f360e02c..9ed9f6521155 100644 --- a/trunk/net/socket.c +++ b/trunk/net/socket.c @@ -119,10 +119,6 @@ static ssize_t sock_writev(struct file *file, const struct iovec *vector, static ssize_t sock_sendpage(struct file *file, struct page *page, int offset, size_t size, loff_t *ppos, int more); -extern ssize_t generic_splice_sendpage(struct inode *inode, struct file *out, - size_t len, unsigned int flags); - - /* * Socket files have a set of 'special' operations as well as the generic file ones. These don't appear * in the operation structures but are done directly via the socketcall() multiplexor.