The patch titled reiser4: specify splice file operations has been removed from the -mm tree. Its filename was reiser4-specify-splice-file-operations.patch This patch was dropped because it was folded into reiser4.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: reiser4: specify splice file operations From: Edward Shishkin <edward.shishkin@xxxxxxxxx> Specify splice_read, splice_write file operations for loopback functionality. Signed-off-by: Edward Shishkin <edward.shishkin@xxxxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/reiser4/plugin/file/cryptcompress.c | 3 ++- fs/reiser4/plugin/object.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff -puN fs/reiser4/plugin/file/cryptcompress.c~reiser4-specify-splice-file-operations fs/reiser4/plugin/file/cryptcompress.c --- a/fs/reiser4/plugin/file/cryptcompress.c~reiser4-specify-splice-file-operations +++ a/fs/reiser4/plugin/file/cryptcompress.c @@ -3747,13 +3747,14 @@ int release_cryptcompress(struct inode * int prepare_write_cryptcompress(struct file *file, struct page *page, unsigned from, unsigned to) { - return 0; + return -EINVAL; } /* plugin->commit_write */ int commit_write_cryptcompress(struct file *file, struct page *page, unsigned from, unsigned to) { + BUG(); return 0; } diff -puN fs/reiser4/plugin/object.c~reiser4-specify-splice-file-operations fs/reiser4/plugin/object.c --- a/fs/reiser4/plugin/object.c~reiser4-specify-splice-file-operations +++ a/fs/reiser4/plugin/object.c @@ -103,7 +103,9 @@ static struct file_operations regular_fi .mmap = reiser4_mmap_careful, .open = reiser4_open_careful, .release = reiser4_release_careful, - .fsync = reiser4_sync_file_common + .fsync = reiser4_sync_file_common, + .splice_read = generic_file_splice_read, + .splice_write = generic_file_splice_write }; static struct address_space_operations regular_file_a_ops = { .writepage = reiser4_writepage, _ Patches currently in -mm which might be from edward.shishkin@xxxxxxxxx are origin.patch reiser4.patch reiser4-specify-splice-file-operations.patch reiser4-fix-dummy-ioctl_cryptcompress.patch reiser4-granulate-rw-serialization-when-accessing-file-conversion-set.patch reiser4-fix-disk-cluster-synchronization.patch reiser4-use-balance_dirty_pages_ratelimited_nr.patch reiser4-correct-references-to-filemap_nopage.patch reiser4-fix-null-pointer-dereference-in-reiser4_write_extent.patch reiser4-code-cleanups.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html