git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
mm
/
page_io.c
diff --git
a/mm/page_io.c
b/mm/page_io.c
index
667c76d
..
bb2b0d5
100644
(file)
--- a/
mm/page_io.c
+++ b/
mm/page_io.c
@@
-19,7
+19,7
@@
#include <linux/writeback.h>
#include <asm/pgtable.h>
#include <linux/writeback.h>
#include <asm/pgtable.h>
-static struct bio *get_swap_bio(
unsigned int __nocas
t gfp_flags, pgoff_t index,
+static struct bio *get_swap_bio(
gfp_
t gfp_flags, pgoff_t index,
struct page *page, bio_end_io_t end_io)
{
struct bio *bio;
struct page *page, bio_end_io_t end_io)
{
struct bio *bio;
@@
-91,7
+91,8
@@
int swap_writepage(struct page *page, struct writeback_control *wbc)
unlock_page(page);
goto out;
}
unlock_page(page);
goto out;
}
- bio = get_swap_bio(GFP_NOIO, page->private, page, end_swap_bio_write);
+ bio = get_swap_bio(GFP_NOIO, page_private(page), page,
+ end_swap_bio_write);
if (bio == NULL) {
set_page_dirty(page);
unlock_page(page);
if (bio == NULL) {
set_page_dirty(page);
unlock_page(page);
@@
-115,7
+116,8
@@
int swap_readpage(struct file *file, struct page *page)
BUG_ON(!PageLocked(page));
ClearPageUptodate(page);
BUG_ON(!PageLocked(page));
ClearPageUptodate(page);
- bio = get_swap_bio(GFP_KERNEL, page->private, page, end_swap_bio_read);
+ bio = get_swap_bio(GFP_KERNEL, page_private(page), page,
+ end_swap_bio_read);
if (bio == NULL) {
unlock_page(page);
ret = -ENOMEM;
if (bio == NULL) {
unlock_page(page);
ret = -ENOMEM;
@@
-127,7
+129,7
@@
out:
return ret;
}
return ret;
}
-#if
defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_PM_DISK)
+#if
def CONFIG_SOFTWARE_SUSPEND
/*
* A scruffy utility function to read or write an arbitrary swap page
* and wait on the I/O. The caller must have a ref on the page.
/*
* A scruffy utility function to read or write an arbitrary swap page
* and wait on the I/O. The caller must have a ref on the page.