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

Commit 40bee44e authored by Mark Fasheh's avatar Mark Fasheh Committed by Jens Axboe
Browse files

Export __splice_from_pipe() 



Ocfs2 wants to implement it's own splice write actor so that it can better
manage cluster / page locks. This lets us re-use the rest of splice write
while only providing our own code where it's actually important.

Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 08c72591

fs/splice.c

+4 −3
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ static int pipe_to_file(struct pipe_inode_info *pipe, struct pipe_buffer *buf, 
 * key here is the 'actor' worker passed in that actually moves the data

 * to the wanted destination. See pipe_to_file/pipe_to_sendpage above.

 */

static ssize_t __splice_from_pipe(struct pipe_inode_info *pipe,

ssize_t __splice_from_pipe(struct pipe_inode_info *pipe,

			   struct file *out, loff_t *ppos, size_t len,

			   unsigned int flags, splice_actor *actor)

{
@@ -747,6 +747,7 @@ static ssize_t __splice_from_pipe(struct pipe_inode_info *pipe, 


	return ret;

}

EXPORT_SYMBOL(__splice_from_pipe);



ssize_t splice_from_pipe(struct pipe_inode_info *pipe, struct file *out,

			 loff_t *ppos, size_t len, unsigned int flags,

include/linux/pipe_fs_i.h

+4 −0
Original line number Diff line number Diff line
@@ -99,4 +99,8 @@ extern ssize_t splice_from_pipe(struct pipe_inode_info *, struct file *, 
				loff_t *, size_t, unsigned int,

				splice_actor *);



extern ssize_t __splice_from_pipe(struct pipe_inode_info *, struct file *,

				  loff_t *, size_t, unsigned int,

				  splice_actor *);



#endif