aboutsummaryrefslogtreecommitdiffstats
path: root/mm/page_io.c
diff options
context:
space:
mode:
authorMel Gorman <mgorman@suse.de>2012-07-31 19:45:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-31 21:42:47 -0400
commit5a178119b0fbe37f7dfb602b37df9cc4b1dc9d71 (patch)
tree22ddd286aac202ccb8c063f02792fc9c90a0b8da /mm/page_io.c
parenta509bc1a9e487d952d9404318f7f990166ab57a7 (diff)
mm: add support for direct_IO to highmem pages
The patch "mm: add support for a filesystem to activate swap files and use direct_IO for writing swap pages" added support for using direct_IO to write swap pages but it is insufficient for highmem pages. To support highmem pages, this patch kmaps() the page before calling the direct_IO() handler. As direct_IO deals with virtual addresses an additional helper is necessary for get_kernel_pages() to lookup the struct page for a kmap virtual address. Signed-off-by: Mel Gorman <mgorman@suse.de> Acked-by: Rik van Riel <riel@redhat.com> Cc: Christoph Hellwig <hch@infradead.org> Cc: David S. Miller <davem@davemloft.net> Cc: Eric B Munson <emunson@mgebm.net> Cc: Eric Paris <eparis@redhat.com> Cc: James Morris <jmorris@namei.org> Cc: Mel Gorman <mgorman@suse.de> Cc: Mike Christie <michaelc@cs.wisc.edu> Cc: Neil Brown <neilb@suse.de> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Cc: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: Xiaotian Feng <dfeng@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_io.c')
-rw-r--r--mm/page_io.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page_io.c b/mm/page_io.c
index 4a379629e31f..78eee32ee486 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -205,7 +205,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
205 struct file *swap_file = sis->swap_file; 205 struct file *swap_file = sis->swap_file;
206 struct address_space *mapping = swap_file->f_mapping; 206 struct address_space *mapping = swap_file->f_mapping;
207 struct iovec iov = { 207 struct iovec iov = {
208 .iov_base = page_address(page), 208 .iov_base = kmap(page),
209 .iov_len = PAGE_SIZE, 209 .iov_len = PAGE_SIZE,
210 }; 210 };
211 211
@@ -218,6 +218,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
218 ret = mapping->a_ops->direct_IO(KERNEL_WRITE, 218 ret = mapping->a_ops->direct_IO(KERNEL_WRITE,
219 &kiocb, &iov, 219 &kiocb, &iov,
220 kiocb.ki_pos, 1); 220 kiocb.ki_pos, 1);
221 kunmap(page);
221 if (ret == PAGE_SIZE) { 222 if (ret == PAGE_SIZE) {
222 count_vm_event(PSWPOUT); 223 count_vm_event(PSWPOUT);
223 ret = 0; 224 ret = 0;