From: Andrew Morton Date: Wed, 19 Jun 2013 00:06:16 +0000 (+1000) Subject: swap-discard-while-swapping-only-if-swap_flag_discard_pages-fix X-Git-Tag: next-20130619~2^2~482 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ee2104dd47ba5e752fab9baa0c3e74340a67b510;p=karo-tx-linux.git swap-discard-while-swapping-only-if-swap_flag_discard_pages-fix tweak comments Cc: Hugh Dickins Cc: Rafael Aquini Signed-off-by: Andrew Morton --- diff --git a/mm/swapfile.c b/mm/swapfile.c index 2fec360705e2..36af6eeaa67e 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2140,17 +2140,17 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) if ((swap_flags & SWAP_FLAG_DISCARD) && swap_discardable(p)) { /* - * When discard is enabled for swap, with no particular - * policy flagged, we set all swap discard flags here - * in order to sustain backward compatibility with - * older swapon(8) releases. + * When discard is enabled for swap with no particular + * policy flagged, we set all swap discard flags here in + * order to sustain backward compatibility with older + * swapon(8) releases. */ p->flags |= (SWP_DISCARDABLE | SWP_AREA_DISCARD | SWP_PAGE_DISCARD); /* * By flagging sys_swapon, a sysadmin can tell us to - * either do sinle-time area discards only, or to just + * either do single-time area discards only, or to just * perform discards for released swap page-clusters. * Now it's time to adjust the p->flags accordingly. */