From 0f1f0649f3fe667d8e0c547e6a498ed79a5294b4 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shli@kernel.org>
Date: Wed, 21 Mar 2012 16:34:17 -0700
Subject: [PATCH] --- yaml --- r: 292673 b: refs/heads/master c:
 052b1987faca3606109d88d96bce124851f7c4c2 h: refs/heads/master i:   292671:
 383ae9b7d6d12942b4f14554a56e194b87b540f6 v: v3

---
 [refs]              | 2 +-
 trunk/mm/swapfile.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2f081b8881d4..b7d582576fb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1480de0340a8d5f094b74d7c4b902456c9a06903
+refs/heads/master: 052b1987faca3606109d88d96bce124851f7c4c2
diff --git a/trunk/mm/swapfile.c b/trunk/mm/swapfile.c
index b82c028cfcc6..21b56945c5d2 100644
--- a/trunk/mm/swapfile.c
+++ b/trunk/mm/swapfile.c
@@ -2103,7 +2103,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
 			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;
 	}