Merge tag 'trace-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[karo-tx-linux.git] / mm / zpool.c

diff --git a/mm/zpool.c b/mm/zpool.c
index bacdab6e47de33694cac67443c6e3fbdd2c85c9f..722a4f60e90b29cd3626cdc4acddc1594ab7a0a5 100644 (file)
--- a/mm/zpool.c
+++ b/mm/zpool.c
@@ -73,33 +73,6 @@ int zpool_unregister_driver(struct zpool_driver *driver)
 }
 EXPORT_SYMBOL(zpool_unregister_driver);
 
-/**
- * zpool_evict() - evict callback from a zpool implementation.
- * @pool:      pool to evict from.
- * @handle:    handle to evict.
- *
- * This can be used by zpool implementations to call the
- * user's evict zpool_ops struct evict callback.
- */
-int zpool_evict(void *pool, unsigned long handle)
-{
-       struct zpool *zpool;
-
-       spin_lock(&pools_lock);
-       list_for_each_entry(zpool, &pools_head, list) {
-               if (zpool->pool == pool) {
-                       spin_unlock(&pools_lock);
-                       if (!zpool->ops || !zpool->ops->evict)
-                               return -EINVAL;
-                       return zpool->ops->evict(zpool, handle);
-               }
-       }
-       spin_unlock(&pools_lock);
-
-       return -ENOENT;
-}
-EXPORT_SYMBOL(zpool_evict);
-
 static struct zpool_driver *zpool_get_driver(char *type)
 {
        struct zpool_driver *driver;
@@ -147,7 +120,7 @@ struct zpool *zpool_create_pool(char *type, char *name, gfp_t gfp,
        struct zpool_driver *driver;
        struct zpool *zpool;
 
-       pr_info("creating pool type %s\n", type);
+       pr_debug("creating pool type %s\n", type);
 
        driver = zpool_get_driver(type);
 
@@ -170,7 +143,7 @@ struct zpool *zpool_create_pool(char *type, char *name, gfp_t gfp,
 
        zpool->type = driver->type;
        zpool->driver = driver;
-       zpool->pool = driver->create(name, gfp, ops);
+       zpool->pool = driver->create(name, gfp, ops, zpool);
        zpool->ops = ops;
 
        if (!zpool->pool) {
@@ -180,7 +153,7 @@ struct zpool *zpool_create_pool(char *type, char *name, gfp_t gfp,
                return NULL;
        }
 
-       pr_info("created %s pool\n", type);
+       pr_debug("created pool type %s\n", type);
 
        spin_lock(&pools_lock);
        list_add(&zpool->list, &pools_head);
@@ -202,7 +175,7 @@ struct zpool *zpool_create_pool(char *type, char *name, gfp_t gfp,
  */
 void zpool_destroy_pool(struct zpool *zpool)
 {
-       pr_info("destroying pool type %s\n", zpool->type);
+       pr_debug("destroying pool type %s\n", zpool->type);
 
        spin_lock(&pools_lock);
        list_del(&zpool->list);