mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
17afb853ee
also refresh generic patches for 3.14, 3.18, 3.19 and 4.0 targets might need a minor refresh as well, however, it looks like everything still applies cleanly with occasional small offsets. Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 44876
29 lines
874 B
Diff
29 lines
874 B
Diff
--- a/fs/yaffs2/yaffs_vfs.c
|
|
+++ b/fs/yaffs2/yaffs_vfs.c
|
|
@@ -796,13 +796,13 @@ static int yaffs_sync_object(struct file
|
|
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 @@ static int yaffs_readlink(struct dentry
|
|
if (!alias)
|
|
return -ENOMEM;
|
|
|
|
- ret = vfs_readlink(dentry, buffer, buflen, alias);
|
|
+ ret = readlink_copy(buffer, buflen, alias);
|
|
kfree(alias);
|
|
return ret;
|
|
}
|