aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-03-10 13:08:17 +0000
committerJohn Crispin <blogic@openwrt.org>2015-03-10 13:08:17 +0000
commit2c3e6a475e985b6699bb0451e38b6eb4d113abfb (patch)
treea7cdf5372a63174207f1108a8128a41a35b02691 /target/linux/generic/patches-4.0
parented09a52d69e086d40b1a0f178454487d8f89db89 (diff)
downloadmaster-187ad058-2c3e6a475e985b6699bb0451e38b6eb4d113abfb.tar.gz
master-187ad058-2c3e6a475e985b6699bb0451e38b6eb4d113abfb.tar.bz2
master-187ad058-2c3e6a475e985b6699bb0451e38b6eb4d113abfb.zip
kernel: fix yaffs compile for >= v3.16
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44643 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0')
-rw-r--r--target/linux/generic/patches-4.0/505-yaffs-3.16-new-fops.patch28
1 files changed, 28 insertions, 0 deletions
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;
+ }