You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
981 B
32 lines
981 B
--- a/fs/yaffs2/yaffs_vfs.c
|
|
+++ b/fs/yaffs2/yaffs_vfs.c
|
|
@@ -794,15 +794,15 @@ static int yaffs_sync_object(struct file
|
|
|
|
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22))
|
|
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 = new_sync_read,
|
|
+ .write = new_sync_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;
|
|
}
|
|
|