projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PM: Wait for console in resume
[cascardo/linux.git]
/
mm
/
page_io.c
diff --git
a/mm/page_io.c
b/mm/page_io.c
index
3b97f68
..
dc6ce0a
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;
}
@@
-125,8
+125,8
@@
int swap_readpage(struct file *file, struct page *page)
struct bio *bio;
int ret = 0;
struct bio *bio;
int ret = 0;
- BUG_ON(!PageLocked(page));
-
ClearPageUptodate(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) {