[PATCH] splice: add direct fd <-> fd splicing support

It's more efficient for sendfile() emulation. Basically we cache an
internal private pipe and just use that as the intermediate area for
pages. Direct splicing is not available from sys_splice(), it is only
meant to be used for sendfile() emulation.

Additional patch from Ingo Molnar to avoid the PIPE_BUFFERS loop at
exit for the normal fast path.

Signed-off-by: Jens Axboe <axboe@suse.de>

1 files changed, 7 insertions, 3 deletions

diff --git a/fs/pipe.c b/fs/pipe.c
index 705b48692627..036536f072c9 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -691,12 +691,10 @@ struct pipe_inode_info * alloc_pipe_info(struct inode *inode)
         return info;
 }
 
-void free_pipe_info(struct inode *inode)
+void __free_pipe_info(struct pipe_inode_info *info)
 {
         int i;
-        struct pipe_inode_info *info = inode->i_pipe;
 
-        inode->i_pipe = NULL;
         for (i = 0; i < PIPE_BUFFERS; i++) {
                 struct pipe_buffer *buf = info->bufs + i;
                 if (buf->ops)
@@ -707,6 +705,12 @@ void free_pipe_info(struct inode *inode)
         kfree(info);
 }
 
+void free_pipe_info(struct inode *inode)
+{
+        __free_pipe_info(inode->i_pipe);
+        inode->i_pipe = NULL;
+}
+
 static struct vfsmount *pipe_mnt __read_mostly;
 static int pipefs_delete_dentry(struct dentry *dentry)
 {