Laurent Riffard wrote:
generic_file_read has been dropped from 2.6.18-rc1-mm1. This patch works for me. Does it look good to reiser4 devloppers ?
No, it does not. I have attached the correct one. Andrew, please apply Thanks, Edward.
Use do_sync_read() instead of generic_file_read() Signed-off-by: Edward Shishkin <[EMAIL PROTECTED]> --- linux-2.6.18-rc1-mm1/fs/reiser4/plugin/file/cryptcompress.c | 2 +- linux-2.6.18-rc1-mm1/fs/reiser4/plugin/object.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) Index: linux-2.6.18-rc1-mm1/fs/reiser4/plugin/file/cryptcompress.c =================================================================== --- linux-2.6.18-rc1-mm1/fs/reiser4/plugin/file/cryptcompress.c.orig +++ linux-2.6.18-rc1-mm1/fs/reiser4/plugin/file/cryptcompress.c @@ -2883,7 +2883,7 @@ down_read(&info->lock); LOCK_CNT_INC(inode_sem_r); - result = generic_file_read(file, buf, size, off); + result = do_sync_read(file, buf, size, off); up_read(&info->lock); LOCK_CNT_DEC(inode_sem_r); Index: linux-2.6.18-rc1-mm1/fs/reiser4/plugin/object.c =================================================================== --- linux-2.6.18-rc1-mm1/fs/reiser4/plugin/object.c.orig +++ linux-2.6.18-rc1-mm1/fs/reiser4/plugin/object.c @@ -305,6 +305,7 @@ .llseek = generic_file_llseek, .read = read_cryptcompress, .write = write_cryptcompress, + .aio_read = generic_file_aio_read, .mmap = mmap_cryptcompress, .release = release_cryptcompress, .fsync = sync_common,
