aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-03-10 13:08:17 +0000
committerJohn Crispin <john@openwrt.org>2015-03-10 13:08:17 +0000
commit850bab25597fc094d561f64edebe3cd38e70a56b (patch)
tree3c54894fc2e9bac85be50a7a9b6654892617afc9
parent9654b3831908706248dbf6d5fe58c23024560a41 (diff)
downloadupstream-850bab25597fc094d561f64edebe3cd38e70a56b.tar.gz
upstream-850bab25597fc094d561f64edebe3cd38e70a56b.tar.bz2
upstream-850bab25597fc094d561f64edebe3cd38e70a56b.zip
kernel: fix yaffs compile for >= v3.16
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 44643
-rw-r--r--target/linux/generic/patches-3.18/505-yaffs-3.16-new-fops.patch28
-rw-r--r--target/linux/generic/patches-3.19/505-yaffs-3.16-new-fops.patch28
-rw-r--r--target/linux/generic/patches-4.0/505-yaffs-3.16-new-fops.patch28
3 files changed, 84 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/505-yaffs-3.16-new-fops.patch b/target/linux/generic/patches-3.18/505-yaffs-3.16-new-fops.patch
new file mode 100644
index 0000000000..855b9fc134
--- /dev/null
+++ b/target/linux/generic/patches-3.18/505-yaffs-3.16-new-fops.patch
@@ -0,0 +1,28 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -796,13 +796,13 @@
+ static const struct file_operations yaffs_file_operations = {
+ .read = do_sync_read,
+ .write = do_sync_write,
+- .aio_read = generic_file_aio_read,
+- .aio_write = generic_file_aio_write,
++ .read_iter = generic_file_read_iter,
++ .write_iter = generic_file_write_iter,
+ .mmap = generic_file_mmap,
+ .flush = yaffs_file_flush,
+ .fsync = yaffs_sync_object,
+ .splice_read = generic_file_splice_read,
+- .splice_write = generic_file_splice_write,
++ .splice_write = iter_file_splice_write,
+ .llseek = generic_file_llseek,
+ };
+
+@@ -1050,7 +1050,7 @@
+ if (!alias)
+ return -ENOMEM;
+
+- ret = vfs_readlink(dentry, buffer, buflen, alias);
++ ret = readlink_copy(buffer, buflen, alias);
+ kfree(alias);
+ return ret;
+ }
diff --git a/target/linux/generic/patches-3.19/505-yaffs-3.16-new-fops.patch b/target/linux/generic/patches-3.19/505-yaffs-3.16-new-fops.patch
new file mode 100644
index 0000000000..855b9fc134
--- /dev/null
+++ b/target/linux/generic/patches-3.19/505-yaffs-3.16-new-fops.patch
@@ -0,0 +1,28 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -796,13 +796,13 @@
+ static const struct file_operations yaffs_file_operations = {
+ .read = do_sync_read,
+ .write = do_sync_write,
+- .aio_read = generic_file_aio_read,
+- .aio_write = generic_file_aio_write,
++ .read_iter = generic_file_read_iter,
++ .write_iter = generic_file_write_iter,
+ .mmap = generic_file_mmap,
+ .flush = yaffs_file_flush,
+ .fsync = yaffs_sync_object,
+ .splice_read = generic_file_splice_read,
+- .splice_write = generic_file_splice_write,
++ .splice_write = iter_file_splice_write,
+ .llseek = generic_file_llseek,
+ };
+
+@@ -1050,7 +1050,7 @@
+ if (!alias)
+ return -ENOMEM;
+
+- ret = vfs_readlink(dentry, buffer, buflen, alias);
++ ret = readlink_copy(buffer, buflen, alias);
+ kfree(alias);
+ return ret;
+ }
diff --git a/target/linux/generic/patches-4.0/505-yaffs-3.16-new-fops.patch b/target/linux/generic/patches-4.0/505-yaffs-3.16-new-fops.patch
new file mode 100644
index 0000000000..855b9fc134
--- /dev/null
+++ b/target/linux/generic/patches-4.0/505-yaffs-3.16-new-fops.patch
@@ -0,0 +1,28 @@
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -796,13 +796,13 @@
+ static const struct file_operations yaffs_file_operations = {
+ .read = do_sync_read,
+ .write = do_sync_write,
+- .aio_read = generic_file_aio_read,
+- .aio_write = generic_file_aio_write,
++ .read_iter = generic_file_read_iter,
++ .write_iter = generic_file_write_iter,
+ .mmap = generic_file_mmap,
+ .flush = yaffs_file_flush,
+ .fsync = yaffs_sync_object,
+ .splice_read = generic_file_splice_read,
+- .splice_write = generic_file_splice_write,
++ .splice_write = iter_file_splice_write,
+ .llseek = generic_file_llseek,
+ };
+
+@@ -1050,7 +1050,7 @@
+ if (!alias)
+ return -ENOMEM;
+
+- ret = vfs_readlink(dentry, buffer, buflen, alias);
++ ret = readlink_copy(buffer, buflen, alias);
+ kfree(alias);
+ return ret;
+ }