summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-04-11 13:59:36 +0200
committerJens Axboe <axboe@suse.de>2006-04-11 13:59:36 +0200
commit88e6faefaeed40a162041d85689e94595756d4c3 (patch)
tree78724ca8f0b7a5d0cf6071e5615e2e6eee3ab7f4 /include
parent341b446bc5aa36d1d5b8159c1e66716b5d89024d (diff)
downloadop-kernel-dev-88e6faefaeed40a162041d85689e94595756d4c3.zip
op-kernel-dev-88e6faefaeed40a162041d85689e94595756d4c3.tar.gz
[PATCH] splice: warning fix
From: Andrew Morton <akpm@osdl.org> net/socket.c:148: warning: initialization from incompatible pointer type extern declarations in .c files! Bad boy. Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 9e8e2ee..2a629fd 100644
--- a/include/linux/fs.h
+++ b/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,
OpenPOWER on IntegriCloud