git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
libata: kill the infamous abnormal status message
[sfrench/cifs-2.6.git]
/
mm
/
swapfile.c
diff --git
a/mm/swapfile.c
b/mm/swapfile.c
index a2d9bb4e80df7e3f977b07df8223584c78aba31a..acc172cbe3aa12781cd1d66c4dfde5cf7d929eec 100644
(file)
--- a/
mm/swapfile.c
+++ b/
mm/swapfile.c
@@
-1531,9
+1531,6
@@
asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags)
error = PTR_ERR(page);
goto bad_swap;
}
- wait_on_page_locked(page);
- if (!PageUptodate(page))
- goto bad_swap;
kmap(page);
swap_header = page_address(page);