Merge tag 'kvm-arm-for-v4.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / include / linux / zpool.h

diff --git a/include/linux/zpool.h b/include/linux/zpool.h
index d30eff3d84d54282656e687313ca6db4ef8c8d90..42f8ec9924523aa1436ca72ef606ef6030e360c8 100644 (file)
--- a/include/linux/zpool.h
+++ b/include/linux/zpool.h
@@ -36,8 +36,10 @@ enum zpool_mapmode {
        ZPOOL_MM_DEFAULT = ZPOOL_MM_RW
 };
 
+bool zpool_has_pool(char *type);
+
 struct zpool *zpool_create_pool(char *type, char *name,
-                       gfp_t gfp, struct zpool_ops *ops);
+                       gfp_t gfp, const struct zpool_ops *ops);
 
 char *zpool_get_type(struct zpool *pool);
 
@@ -81,7 +83,7 @@ struct zpool_driver {
        atomic_t refcount;
        struct list_head list;
 
-       void *(*create)(char *name, gfp_t gfp, struct zpool_ops *ops,
+       void *(*create)(char *name, gfp_t gfp, const struct zpool_ops *ops,
                        struct zpool *zpool);
        void (*destroy)(void *pool);