summaryrefslogtreecommitdiff
path: root/fs/yaffs2/yaffs_fs.c
diff options
context:
space:
mode:
authorJustin Waters <justin.waters@timesys.com>2008-05-29 12:11:33 -0400
committerJustin Waters <justin.waters@timesys.com>2008-05-29 12:11:33 -0400
commit1c540b11703e195414ee2a101de90d61c36415ac (patch)
tree714c41b0737d3b1db6c5bd5e5a75ad7131a1a235 /fs/yaffs2/yaffs_fs.c
parent1409e6a897e012b5473762be338afe3c7e6fab76 (diff)
Update YAFFS to match new FS API2.6.24-mx27lite-200805291611
The readfile method in the file_operations struct has been deprecated as of 2.6.22 and replaced with spliceread. This updates YAFFS to match. Signed-off-by: Justin Waters <justin.waters@timesys.com>
Diffstat (limited to 'fs/yaffs2/yaffs_fs.c')
-rw-r--r--fs/yaffs2/yaffs_fs.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/yaffs2/yaffs_fs.c b/fs/yaffs2/yaffs_fs.c
index 33b7a1b8d527..9db481d1fc04 100644
--- a/fs/yaffs2/yaffs_fs.c
+++ b/fs/yaffs2/yaffs_fs.c
@@ -216,7 +216,10 @@ static struct file_operations yaffs_file_operations = {
.mmap = generic_file_mmap,
.flush = yaffs_file_flush,
.fsync = yaffs_sync_object,
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
+ .splice_read = generic_file_splice_read,
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
.sendfile = generic_file_sendfile,
#endif