diff options
author | Mel Gorman <mgorman@suse.de> | 2012-07-31 19:45:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:42:47 -0400 |
commit | 5a178119b0fbe37f7dfb602b37df9cc4b1dc9d71 (patch) | |
tree | 22ddd286aac202ccb8c063f02792fc9c90a0b8da /mm/highmem.c | |
parent | a509bc1a9e487d952d9404318f7f990166ab57a7 (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/highmem.c')
-rw-r--r-- | mm/highmem.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mm/highmem.c b/mm/highmem.c index 57d82c6250c3..d517cd16a6eb 100644 --- a/mm/highmem.c +++ b/mm/highmem.c | |||
@@ -94,6 +94,18 @@ static DECLARE_WAIT_QUEUE_HEAD(pkmap_map_wait); | |||
94 | do { spin_unlock(&kmap_lock); (void)(flags); } while (0) | 94 | do { spin_unlock(&kmap_lock); (void)(flags); } while (0) |
95 | #endif | 95 | #endif |
96 | 96 | ||
97 | struct page *kmap_to_page(void *vaddr) | ||
98 | { | ||
99 | unsigned long addr = (unsigned long)vaddr; | ||
100 | |||
101 | if (addr >= PKMAP_ADDR(0) && addr <= PKMAP_ADDR(LAST_PKMAP)) { | ||
102 | int i = (addr - PKMAP_ADDR(0)) >> PAGE_SHIFT; | ||
103 | return pte_page(pkmap_page_table[i]); | ||
104 | } | ||
105 | |||
106 | return virt_to_page(addr); | ||
107 | } | ||
108 | |||
97 | static void flush_all_zero_pkmaps(void) | 109 | static void flush_all_zero_pkmaps(void) |
98 | { | 110 | { |
99 | int i; | 111 | int i; |