summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsfs.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-04-02 19:53:36 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-06 17:37:58 -0400
commite6a7bcb4c489e3e078ba3cc92ae6621b2b8bb9a7 (patch)
tree8b63cc360ea4bf19d3933918e33dd37dc71cd0aa /fs/cifs/cifsfs.c
parent37c20f16e7a73e5fe34815e785ca6c5a46e4d260 (diff)
downloadop-kernel-dev-e6a7bcb4c489e3e078ba3cc92ae6621b2b8bb9a7.zip
op-kernel-dev-e6a7bcb4c489e3e078ba3cc92ae6621b2b8bb9a7.tar.gz
cifs: switch to ->read_iter()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r--fs/cifs/cifsfs.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index c57a9b1..f0a567a 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -907,9 +907,9 @@ const struct file_operations cifs_file_ops = {
};
const struct file_operations cifs_file_strict_ops = {
- .read = do_sync_read,
+ .read = new_sync_read,
.write = do_sync_write,
- .aio_read = cifs_strict_readv,
+ .read_iter = cifs_strict_readv,
.aio_write = cifs_strict_writev,
.open = cifs_open,
.release = cifs_close,
@@ -927,9 +927,9 @@ const struct file_operations cifs_file_strict_ops = {
const struct file_operations cifs_file_direct_ops = {
/* BB reevaluate whether they can be done with directio, no cache */
- .read = do_sync_read,
+ .read = new_sync_read,
.write = do_sync_write,
- .aio_read = cifs_user_readv,
+ .read_iter = cifs_user_readv,
.aio_write = cifs_user_writev,
.open = cifs_open,
.release = cifs_close,
@@ -964,9 +964,9 @@ const struct file_operations cifs_file_nobrl_ops = {
};
const struct file_operations cifs_file_strict_nobrl_ops = {
- .read = do_sync_read,
+ .read = new_sync_read,
.write = do_sync_write,
- .aio_read = cifs_strict_readv,
+ .read_iter = cifs_strict_readv,
.aio_write = cifs_strict_writev,
.open = cifs_open,
.release = cifs_close,
@@ -983,9 +983,9 @@ const struct file_operations cifs_file_strict_nobrl_ops = {
const struct file_operations cifs_file_direct_nobrl_ops = {
/* BB reevaluate whether they can be done with directio, no cache */
- .read = do_sync_read,
+ .read = new_sync_read,
.write = do_sync_write,
- .aio_read = cifs_user_readv,
+ .read_iter = cifs_user_readv,
.aio_write = cifs_user_writev,
.open = cifs_open,
.release = cifs_close,
OpenPOWER on IntegriCloud