Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88e6faef authored by Andrew Morton's avatar Andrew Morton Committed by Jens Axboe
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJens Axboe <axboe@suse.de>
parent 341b446b

include/linux/fs.h

+10 −3
Original line number Diff line number Diff line
@@ -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);



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,

net/socket.c

+0 −4
Original line number Diff line number Diff line
@@ -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.