Hi,
I'm following the same path, I just added the squashfs patch to my ubuntu 8.04 2.6.24-27 openvz kernel, but applying the unionfs-2.5_for_2.6.24.7.diff patch fails :
patching file fs/splice.c
Hunk #1 FAILED at 893.
Hunk #2 FAILED at 914.
Hunk #3 succeeded at 897 with fuzz 2 (offset -44 lines).
Hunk #4 succeeded at 1025 (offset 14 lines).
Hunk #5 succeeded at 1083 (offset 14 lines).
Hunk #6 succeeded at 1157 (offset 14 lines).
Hunk #7 succeeded at 1178 (offset 14 lines).
2 out of 7 hunks FAILED -- saving rejects to file fs/splice.c.rej
Here is the fs/splice.c.rej content:
*************** EXPORT_SYMBOL(generic_splice_sendpage);
*** 893,900 ****
/*
* 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)
{
int ret;
--- 893,900 ----
/*
* Attempt to initiate a splice from pipe to file.
*/
+ long vfs_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ loff_t *ppos, size_t len, unsigned int flags)
{
int ret;
*************** static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
*** 914,926 ****
return out->f_op->splice_write(pipe, out, ppos, len, flags);
}
/*
* 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)
{
int ret;
--- 914,927 ----
return out->f_op->splice_write(pipe, out, ppos, len, flags);
}
+ EXPORT_SYMBOL_GPL(vfs_splice_from);
/*
* Attempt to initiate a splice from a file to a pipe.
*/
+ long vfs_splice_to(struct file *in, loff_t *ppos,
+ struct pipe_inode_info *pipe, size_t len,
+ unsigned int flags)
{
int ret;
Maddis, what did you have to fix to get it working ?
Thanks
