LU-8130 lov: convert lo[v|d]_pool to use rhashtable

[fs/lustre-release.git] / lustre / lov / lov_obd.c

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index e151cc9..a66b697 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -65,7 +65,6 @@ void lov_tgts_getref(struct obd_device *obd)
        mutex_lock(&lov->lov_lock);
        atomic_inc(&lov->lov_refcount);
        mutex_unlock(&lov->lov_lock);
-       return;
 }
 
 static void __lov_del_obd(struct obd_device *obd, struct lov_tgt_desc *tgt);
@@ -77,7 +76,7 @@ void lov_tgts_putref(struct obd_device *obd)
        mutex_lock(&lov->lov_lock);
        /* ok to dec to 0 more than once -- ltd_exp's will be null */
        if (atomic_dec_and_test(&lov->lov_refcount) && lov->lov_death_row) {
-               struct list_head kill = LIST_HEAD_INIT(kill);
+               LIST_HEAD(kill);
                struct lov_tgt_desc *tgt, *n;
                int i;
 
@@ -146,12 +145,12 @@ int lov_connect_osc(struct obd_device *obd, u32 index, int activate,
          */
         imp = tgt_obd->u.cli.cl_import;
 
-        if (activate) {
-                tgt_obd->obd_no_recov = 0;
-                /* FIXME this is probably supposed to be
-                   ptlrpc_set_import_active.  Horrible naming. */
-                ptlrpc_activate_import(imp);
-        }
+       if (activate) {
+               tgt_obd->obd_no_recov = 0;
+               /* FIXME this is probably supposed to be
+                  ptlrpc_set_import_active.  Horrible naming. */
+               ptlrpc_activate_import(imp, false);
+       }
 
         rc = obd_register_observer(tgt_obd, obd);
         if (rc) {
@@ -696,10 +695,10 @@ void lov_fix_desc_stripe_count(__u32 *val)
 void lov_fix_desc_pattern(__u32 *val)
 {
         /* from lov_setstripe */
-        if ((*val != 0) && (*val != LOV_PATTERN_RAID0)) {
-                LCONSOLE_WARN("Unknown stripe pattern: %#x\n", *val);
-                *val = 0;
-        }
+       if ((*val != 0) && !lov_pattern_supported_normal_comp(*val)) {
+               LCONSOLE_WARN("lov: Unknown stripe pattern: %#x\n", *val);
+               *val = 0;
+       }
 }
 
 void lov_fix_desc_qos_maxage(__u32 *val)
@@ -760,15 +759,12 @@ int lov_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 
        init_rwsem(&lov->lov_notify_lock);
 
-        lov->lov_pools_hash_body = cfs_hash_create("POOLS", HASH_POOLS_CUR_BITS,
-                                                   HASH_POOLS_MAX_BITS,
-                                                   HASH_POOLS_BKT_BITS, 0,
-                                                   CFS_HASH_MIN_THETA,
-                                                   CFS_HASH_MAX_THETA,
-                                                   &pool_hash_operations,
-                                                   CFS_HASH_DEFAULT);
        INIT_LIST_HEAD(&lov->lov_pool_list);
         lov->lov_pool_count = 0;
+       rc = lov_pool_hash_init(&lov->lov_pools_hash_body);
+       if (rc)
+               GOTO(out, rc);
+
         rc = lov_ost_pool_init(&lov->lov_packed, 0);
         if (rc)
                GOTO(out, rc);
@@ -805,7 +801,7 @@ static int lov_cleanup(struct obd_device *obd)
                /* coverity[overrun-buffer-val] */
                 lov_pool_del(obd, pool->pool_name);
         }
-        cfs_hash_putref(lov->lov_pools_hash_body);
+       lov_pool_hash_destroy(&lov->lov_pools_hash_body);
         lov_ost_pool_free(&lov->lov_packed);
 
        lprocfs_obd_cleanup(obd);
@@ -1163,10 +1159,7 @@ static int lov_get_info(const struct lu_env *env, struct obd_export *exp,
        lov_tgts_getref(obddev);
 
        if (KEY_IS(KEY_MAX_EASIZE)) {
-               u32 max_stripe_count = min_t(u32, ld->ld_active_tgt_count,
-                                            LOV_MAX_STRIPE_COUNT);
-
-               *((u32 *)val) = lov_mds_md_size(max_stripe_count, LOV_MAGIC_V3);
+               *((u32 *)val) = exp->exp_connect_data.ocd_max_easize;
        } else if (KEY_IS(KEY_DEFAULT_EASIZE)) {
                u32 def_stripe_count = min_t(u32, ld->ld_default_stripe_count,
                                             LOV_MAX_STRIPE_COUNT);
@@ -1328,7 +1321,7 @@ static int lov_quotactl(struct obd_device *obd, struct obd_export *exp,
         RETURN(rc);
 }
 
-static struct obd_ops lov_obd_ops = {
+static const struct obd_ops lov_obd_ops = {
        .o_owner                = THIS_MODULE,
        .o_setup                = lov_setup,
        .o_cleanup              = lov_cleanup,
@@ -1350,8 +1343,6 @@ struct kmem_cache *lov_oinfo_slab;
 
 static int __init lov_init(void)
 {
-       bool enable_proc = true;
-       struct obd_type *type;
        int rc;
        ENTRY;
 
@@ -1372,13 +1363,8 @@ static int __init lov_init(void)
                 return -ENOMEM;
         }
 
-       type = class_search_type(LUSTRE_LOD_NAME);
-       if (type != NULL && type->typ_procsym != NULL)
-               enable_proc = false;
-
-       rc = class_register_type(&lov_obd_ops, NULL, enable_proc, NULL,
+       rc = class_register_type(&lov_obd_ops, NULL, true, NULL,
                                 LUSTRE_LOV_NAME, &lov_device_type);
-
         if (rc) {
                kmem_cache_destroy(lov_oinfo_slab);
                 lu_kmem_fini(lov_caches);