1 files changed, 19 insertions, 4 deletions

diff --git a/mm/zbud.c b/mm/zbud.c
index 2ee4e4520493..f3bf6f7627d8 100644
--- a/mm/zbud.c
+++ b/mm/zbud.c
@@ -97,6 +97,10 @@ struct zbud_pool {
         struct list_head lru;
         u64 pages_nr;
         struct zbud_ops *ops;
+#ifdef CONFIG_ZPOOL
+        struct zpool *zpool;
+        struct zpool_ops *zpool_ops;
+#endif
 };
 
 /*
@@ -123,7 +127,10 @@ struct zbud_header {
 
 static int zbud_zpool_evict(struct zbud_pool *pool, unsigned long handle)
 {
-        return zpool_evict(pool, handle);
+        if (pool->zpool && pool->zpool_ops && pool->zpool_ops->evict)
+                return pool->zpool_ops->evict(pool->zpool, handle);
+        else
+                return -ENOENT;
 }
 
 static struct zbud_ops zbud_zpool_ops = {
@@ -131,9 +138,17 @@ static struct zbud_ops zbud_zpool_ops = {
 };
 
 static void *zbud_zpool_create(char *name, gfp_t gfp,
-                        struct zpool_ops *zpool_ops)
+                               struct zpool_ops *zpool_ops,
+                               struct zpool *zpool)
 {
-        return zbud_create_pool(gfp, zpool_ops ? &zbud_zpool_ops : NULL);
+        struct zbud_pool *pool;
+
+        pool = zbud_create_pool(gfp, zpool_ops ? &zbud_zpool_ops : NULL);
+        if (pool) {
+                pool->zpool = zpool;
+                pool->zpool_ops = zpool_ops;
+        }
+        return pool;
 }
 
 static void zbud_zpool_destroy(void *pool)
@@ -292,7 +307,7 @@ struct zbud_pool *zbud_create_pool(gfp_t gfp, struct zbud_ops *ops)
         struct zbud_pool *pool;
         int i;
 
-        pool = kmalloc(sizeof(struct zbud_pool), gfp);
+        pool = kzalloc(sizeof(struct zbud_pool), gfp);
         if (!pool)
                 return NULL;
         spin_lock_init(&pool->lock);