module: export param_free_charp()

[mirror_ubuntu-zesty-kernel.git] / mm / zswap.c

diff --git a/mm/zswap.c b/mm/zswap.c
index 4043df7c672fb6f5b1be298b8d510fd17a3bbf42..827568959d74ecf314cf8739c8406bddb5a73073 100644 (file)
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -342,7 +342,7 @@ static void zswap_entry_put(struct zswap_tree *tree,
 static struct zswap_entry *zswap_entry_find_get(struct rb_root *root,
                                pgoff_t offset)
 {
-       struct zswap_entry *entry = NULL;
+       struct zswap_entry *entry;
 
        entry = zswap_rb_search(root, offset);
        if (entry)
@@ -571,7 +571,7 @@ static struct zswap_pool *zswap_pool_find_get(char *type, char *compressor)
 static struct zswap_pool *zswap_pool_create(char *type, char *compressor)
 {
        struct zswap_pool *pool;
-       gfp_t gfp = __GFP_NORETRY | __GFP_NOWARN;
+       gfp_t gfp = __GFP_NORETRY | __GFP_NOWARN | __GFP_KSWAPD_RECLAIM;
 
        pool = kzalloc(sizeof(*pool), GFP_KERNEL);
        if (!pool) {
@@ -1011,7 +1011,8 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
        /* store */
        len = dlen + sizeof(struct zswap_header);
        ret = zpool_malloc(entry->pool->zpool, len,
-                          __GFP_NORETRY | __GFP_NOWARN, &handle);
+                          __GFP_NORETRY | __GFP_NOWARN | __GFP_KSWAPD_RECLAIM,
+                          &handle);
        if (ret == -ENOSPC) {
                zswap_reject_compress_poor++;
                goto put_dstmem;