diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
| commit | e14eee56c2280953c6e3d24d5dce42bd90836b81 (patch) | |
| tree | 21ab792d9ad6fbbab460058f352a0158f995644e /mm/page_io.c | |
| parent | d6ee6f7e4c74d9a0fed7544f4d389bde004651d3 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'mm/page_io.c')
| -rw-r--r-- | mm/page_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_io.c b/mm/page_io.c index dc6ce0afbded..3023c475e041 100644 --- a/mm/page_io.c +++ b/mm/page_io.c | |||
| @@ -111,7 +111,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc) | |||
| 111 | goto out; | 111 | goto out; |
| 112 | } | 112 | } |
| 113 | if (wbc->sync_mode == WB_SYNC_ALL) | 113 | if (wbc->sync_mode == WB_SYNC_ALL) |
| 114 | rw |= (1 << BIO_RW_SYNC); | 114 | rw |= (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG); |
| 115 | count_vm_event(PSWPOUT); | 115 | count_vm_event(PSWPOUT); |
| 116 | set_page_writeback(page); | 116 | set_page_writeback(page); |
| 117 | unlock_page(page); | 117 | unlock_page(page); |