adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SPLICE]: Don't assume regular pages in splice_to_pipe()

Browse source 
Allow caller to pass in a release function, there might be
other resources that need releasing as well. Needed for
network receive.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jens Axboe 2007-11-06 23:29:47 -08:00 committed by David S. Miller
parent d10f2150ea
commit bbdfc2f706
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/splice.c
View file

@ -254,11 +254,16 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
} }
while (page_nr < spd_pages) while (page_nr < spd_pages)
page_cache_release(spd->pages[page_nr++]); spd->spd_release(spd, page_nr++);
return ret; return ret;
} }
static void spd_release_page(struct splice_pipe_desc *spd, unsigned int i)
{
page_cache_release(spd->pages[i]);
}
static int static int
__generic_file_splice_read(struct file *in, loff_t *ppos, __generic_file_splice_read(struct file *in, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len, struct pipe_inode_info *pipe, size_t len,
@ -277,6 +282,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
.partial = partial, .partial = partial,
.flags = flags, .flags = flags,
.ops = &page_cache_pipe_buf_ops, .ops = &page_cache_pipe_buf_ops,
.spd_release = spd_release_page,
}; };
index = *ppos >> PAGE_CACHE_SHIFT; index = *ppos >> PAGE_CACHE_SHIFT;
@ -1432,6 +1438,7 @@ static long vmsplice_to_pipe(struct file *file, const struct iovec __user *iov,
.partial = partial, .partial = partial,
.flags = flags, .flags = flags,
.ops = &user_page_pipe_buf_ops, .ops = &user_page_pipe_buf_ops,
.spd_release = spd_release_page,
}; };
pipe = pipe_info(file->f_path.dentry->d_inode); pipe = pipe_info(file->f_path.dentry->d_inode);

1
include/linux/splice.h
View file

@ -53,6 +53,7 @@ struct splice_pipe_desc {
int nr_pages; /* number of pages in map */ int nr_pages; /* number of pages in map */
unsigned int flags; /* splice flags */ unsigned int flags; /* splice flags */
const struct pipe_buf_operations *ops;/* ops associated with output pipe */ const struct pipe_buf_operations *ops;/* ops associated with output pipe */
void (*spd_release)(struct splice_pipe_desc *, unsigned int);
}; };
typedef int (splice_actor)(struct pipe_inode_info *, struct pipe_buffer *, typedef int (splice_actor)(struct pipe_inode_info *, struct pipe_buffer *,