Even don't add discard option, swapon will do discard, this sounds buggy, especially when discard is slow or buggy. Reported-by: Holger Kiehl <Holger.Kiehl@xxxxxx> Signed-off-by: Shaohua Li <shli@xxxxxxxxxxxx> --- mm/swapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux/mm/swapfile.c =================================================================== --- linux.orig/mm/swapfile.c 2012-03-20 20:11:59.222767526 +0800 +++ linux/mm/swapfile.c 2012-03-20 20:13:25.362767387 +0800 @@ -2105,7 +2105,7 @@ SYSCALL_DEFINE2(swapon, const char __use p->flags |= SWP_SOLIDSTATE; p->cluster_next = 1 + (random32() % p->highest_bit); } - if (discard_swap(p) == 0 && (swap_flags & SWAP_FLAG_DISCARD)) + if ((swap_flags & SWAP_FLAG_DISCARD) && discard_swap(p) == 0) p->flags |= SWP_DISCARDABLE; } -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>