diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-03-04 21:27:34 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 17:32:44 -0400 |
| commit | d8d3d94b80aa1a1c0ca75c58b8abdc7356f38418 (patch) | |
| tree | 132f846b04371426b8795475597846aae75e7e07 /fs/f2fs | |
| parent | cb66a7a1f149ff705fa37cad6d1252b046e0ad4f (diff) | |
pass iov_iter to ->direct_IO()
unmodified, for now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/data.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 45abd60e2bff..3a6ef121c095 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c | |||
| @@ -1010,7 +1010,7 @@ static int check_direct_IO(struct inode *inode, int rw, | |||
| 1010 | } | 1010 | } |
| 1011 | 1011 | ||
| 1012 | static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb, | 1012 | static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb, |
| 1013 | const struct iovec *iov, loff_t offset, unsigned long nr_segs) | 1013 | struct iov_iter *iter, loff_t offset) |
| 1014 | { | 1014 | { |
| 1015 | struct file *file = iocb->ki_filp; | 1015 | struct file *file = iocb->ki_filp; |
| 1016 | struct inode *inode = file->f_mapping->host; | 1016 | struct inode *inode = file->f_mapping->host; |
| @@ -1019,11 +1019,11 @@ static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb, | |||
| 1019 | if (f2fs_has_inline_data(inode)) | 1019 | if (f2fs_has_inline_data(inode)) |
| 1020 | return 0; | 1020 | return 0; |
| 1021 | 1021 | ||
| 1022 | if (check_direct_IO(inode, rw, iov, offset, nr_segs)) | 1022 | if (check_direct_IO(inode, rw, iter->iov, offset, iter->nr_segs)) |
| 1023 | return 0; | 1023 | return 0; |
| 1024 | 1024 | ||
| 1025 | return blockdev_direct_IO(rw, iocb, inode, iov, offset, nr_segs, | 1025 | return blockdev_direct_IO(rw, iocb, inode, iter->iov, offset, |
| 1026 | get_data_block); | 1026 | iter->nr_segs, get_data_block); |
| 1027 | } | 1027 | } |
| 1028 | 1028 | ||
| 1029 | static void f2fs_invalidate_data_page(struct page *page, unsigned int offset, | 1029 | static void f2fs_invalidate_data_page(struct page *page, unsigned int offset, |