From e51e8e7a2fc80d5da86121f5cfef3efbfebf0e92 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Fri, 21 Mar 2008 16:04:42 -0400 Subject: [PATCH] VFS: rename do_splice_to/from to vfs_splice_* and export symbols A stackable file system which uses vm_ops->fault, and does not implement address_space_operations, cannot use generic_file_splice_read/write, but has to implement ->splice_read/write itself. These two helper functions are very useful to such a module. Signed-off-by: Erez Zadok --- fs/splice.c | 22 ++++++++++++---------- include/linux/splice.h | 5 +++++ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index 6909d89d0da..a28514dd3af 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); /* * Attempt to initiate a splice from pipe to file. */ -static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - loff_t *ppos, size_t len, unsigned int flags) +long vfs_splice_from(struct pipe_inode_info *pipe, struct file *out, + loff_t *ppos, size_t len, unsigned int flags) { ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); @@ -1116,13 +1116,14 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, return splice_write(pipe, out, ppos, len, flags); } +EXPORT_SYMBOL_GPL(vfs_splice_from); /* * Attempt to initiate a splice from a file to a pipe. */ -static long do_splice_to(struct file *in, loff_t *ppos, - struct pipe_inode_info *pipe, size_t len, - unsigned int flags) +long vfs_splice_to(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, + unsigned int flags) { ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); @@ -1142,6 +1143,7 @@ static long do_splice_to(struct file *in, loff_t *ppos, return splice_read(in, ppos, pipe, len, flags); } +EXPORT_SYMBOL_GPL(vfs_splice_to); /** * splice_direct_to_actor - splices data directly between two non-pipes @@ -1211,7 +1213,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd, size_t read_len; loff_t pos = sd->pos, prev_pos = pos; - ret = do_splice_to(in, &pos, pipe, len, flags); + ret = vfs_splice_to(in, &pos, pipe, len, flags); if (unlikely(ret <= 0)) goto out_release; @@ -1270,8 +1272,8 @@ static int direct_splice_actor(struct pipe_inode_info *pipe, { struct file *file = sd->u.file; - return do_splice_from(pipe, file, &file->f_pos, sd->total_len, - sd->flags); + return vfs_splice_from(pipe, file, &file->f_pos, sd->total_len, + sd->flags); } /** @@ -1356,7 +1358,7 @@ static long do_splice(struct file *in, loff_t __user *off_in, } else off = &out->f_pos; - ret = do_splice_from(ipipe, out, off, len, flags); + ret = vfs_splice_from(ipipe, out, off, len, flags); if (off_out && copy_to_user(off_out, off, sizeof(loff_t))) ret = -EFAULT; @@ -1376,7 +1378,7 @@ static long do_splice(struct file *in, loff_t __user *off_in, } else off = &in->f_pos; - ret = do_splice_to(in, off, opipe, len, flags); + ret = vfs_splice_to(in, off, opipe, len, flags); if (off_in && copy_to_user(off_in, off, sizeof(loff_t))) ret = -EFAULT; diff --git a/include/linux/splice.h b/include/linux/splice.h index 09a545a7dfa..ebe231acf9b 100644 --- a/include/linux/splice.h +++ b/include/linux/splice.h @@ -82,6 +82,11 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *, struct splice_pipe_desc *); extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *, splice_direct_actor *); +extern long vfs_splice_from(struct pipe_inode_info *pipe, struct file *out, + loff_t *ppos, size_t len, unsigned int flags); +extern long vfs_splice_to(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, + unsigned int flags); /* * for dynamic pipe sizing -- 2.43.0