Merge tag 'for-linus-20181026' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / mm / zswap.c

diff --git a/mm/zswap.c b/mm/zswap.c
index 7d34e69..cd91fd9 100644 (file)
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -1026,6 +1026,15 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
                        ret = -ENOMEM;
                        goto reject;
                }
+
+               /* A second zswap_is_full() check after
+                * zswap_shrink() to make sure it's now
+                * under the max_pool_percent
+                */
+               if (zswap_is_full()) {
+                       ret = -ENOMEM;
+                       goto reject;
+               }
        }
 
        /* allocate entry */