dio: Convert direct_IO to use iov_iter

[karo-tx-linux.git] / mm / page_io.c

diff --git a/mm/page_io.c b/mm/page_io.c
index 8c79a4764be0c99a1d573d174e2d247e90079519..4f7e59909f20bab51b122bbbb9ec8c4fb6a6ff38 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -263,6 +263,9 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
                        .iov_base = kmap(page),
                        .iov_len  = PAGE_SIZE,
                };
+               struct iov_iter iter;
+
+               iov_iter_init(&iter, &iov, 1, PAGE_SIZE, 0);
 
                init_sync_kiocb(&kiocb, swap_file);
                kiocb.ki_pos = page_file_offset(page);
@@ -270,9 +273,8 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
 
                set_page_writeback(page);
                unlock_page(page);
-               ret = mapping->a_ops->direct_IO(KERNEL_WRITE,
-                                               &kiocb, &iov,
-                                               kiocb.ki_pos, 1);
+               ret = mapping->a_ops->direct_IO(KERNEL_WRITE, &kiocb, &iter,
+                                               kiocb.ki_pos);
                kunmap(page);
                if (ret == PAGE_SIZE) {
                        count_vm_event(PSWPOUT);