git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: move inc_zone_page_state(NR_ISOLATED) to just isolated place
[safe/jmp/linux-2.6]
/
mm
/
page_io.c
diff --git
a/mm/page_io.c
b/mm/page_io.c
index
065c448
..
c6f3e50
100644
(file)
--- a/
mm/page_io.c
+++ b/
mm/page_io.c
@@
-98,7
+98,7
@@
int swap_writepage(struct page *page, struct writeback_control *wbc)
struct bio *bio;
int ret = 0, rw = WRITE;
struct bio *bio;
int ret = 0, rw = WRITE;
- if (
remove_exclusive_swap_page
(page)) {
+ if (
try_to_free_swap
(page)) {
unlock_page(page);
goto out;
}
unlock_page(page);
goto out;
}
@@
-111,7
+111,7
@@
int swap_writepage(struct page *page, struct writeback_control *wbc)
goto out;
}
if (wbc->sync_mode == WB_SYNC_ALL)
goto out;
}
if (wbc->sync_mode == WB_SYNC_ALL)
- rw |= (1 << BIO_RW_SYNC);
+ rw |= (1 << BIO_RW_SYNC
IO) | (1 << BIO_RW_UNPLUG
);
count_vm_event(PSWPOUT);
set_page_writeback(page);
unlock_page(page);
count_vm_event(PSWPOUT);
set_page_writeback(page);
unlock_page(page);
@@
-120,13
+120,13
@@
out:
return ret;
}
return ret;
}
-int swap_readpage(struct
file *file, struct
page *page)
+int swap_readpage(struct page *page)
{
struct bio *bio;
int ret = 0;
{
struct bio *bio;
int ret = 0;
- BUG_ON(!PageLocked(page));
- BUG_ON(PageUptodate(page));
+
VM_
BUG_ON(!PageLocked(page));
+
VM_
BUG_ON(PageUptodate(page));
bio = get_swap_bio(GFP_KERNEL, page_private(page), page,
end_swap_bio_read);
if (bio == NULL) {
bio = get_swap_bio(GFP_KERNEL, page_private(page), page,
end_swap_bio_read);
if (bio == NULL) {