diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:56:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:56:31 -0500 |
| commit | 81cfb8864c73230eb1c37753aba517db15cf4d8f (patch) | |
| tree | 649ff25543834cf9983ea41b93126bea97d75475 /mm/page_io.c | |
| parent | 0169e284f6b6b263cc7c2ed25986b96cd6fda610 (diff) | |
| parent | 9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43 (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm/page_io.c')
| -rw-r--r-- | mm/page_io.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/page_io.c b/mm/page_io.c index 330e00d6db00..bb2b0d53889c 100644 --- a/mm/page_io.c +++ b/mm/page_io.c | |||
| @@ -91,7 +91,8 @@ int swap_writepage(struct page *page, struct writeback_control *wbc) | |||
| 91 | unlock_page(page); | 91 | unlock_page(page); |
| 92 | goto out; | 92 | goto out; |
| 93 | } | 93 | } |
| 94 | bio = get_swap_bio(GFP_NOIO, page->private, page, end_swap_bio_write); | 94 | bio = get_swap_bio(GFP_NOIO, page_private(page), page, |
| 95 | end_swap_bio_write); | ||
| 95 | if (bio == NULL) { | 96 | if (bio == NULL) { |
| 96 | set_page_dirty(page); | 97 | set_page_dirty(page); |
| 97 | unlock_page(page); | 98 | unlock_page(page); |
| @@ -115,7 +116,8 @@ int swap_readpage(struct file *file, struct page *page) | |||
| 115 | 116 | ||
| 116 | BUG_ON(!PageLocked(page)); | 117 | BUG_ON(!PageLocked(page)); |
| 117 | ClearPageUptodate(page); | 118 | ClearPageUptodate(page); |
| 118 | bio = get_swap_bio(GFP_KERNEL, page->private, page, end_swap_bio_read); | 119 | bio = get_swap_bio(GFP_KERNEL, page_private(page), page, |
| 120 | end_swap_bio_read); | ||
| 119 | if (bio == NULL) { | 121 | if (bio == NULL) { |
| 120 | unlock_page(page); | 122 | unlock_page(page); |
| 121 | ret = -ENOMEM; | 123 | ret = -ENOMEM; |
