projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[linux-2.6-block.git]
/
mm
/
page_io.c
diff --git
a/mm/page_io.c
b/mm/page_io.c
index d277a80efa711f639bc7ed3fd20b4af017a144fb..dc6ce0afbded84abdfa553300e6ac9d06e00d0a9 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;
- if (
remove_exclusive_swap_page
(page)) {
+ if (
try_to_free_swap
(page)) {
unlock_page(page);
goto out;
}