Merge branch 'linus' into core/locking

[~andy/linux] / mm / swapfile.c

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 1894dead0b5802b10cf1d45fb28a765744b792e6..7c703ff2f36f0b760b79eb36149084f07621a0a1 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2047,7 +2047,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)
+               if (discard_swap(p) == 0 && (swap_flags & SWAP_FLAG_DISCARD))
                        p->flags |= SWP_DISCARDABLE;
        }