LU-4381 lov: to not hold sub locks at initialization

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

diff --git a/lustre/lov/lov_pool.c b/lustre/lov/lov_pool.c
index 32639f0..c017ab4 100644 (file)
--- a/lustre/lov/lov_pool.c
+++ b/lustre/lov/lov_pool.c
@@ -69,7 +69,6 @@ void lov_pool_putref(struct pool_desc *pool)
                 LASSERT(cfs_hlist_unhashed(&pool->pool_hash));
                 LASSERT(cfs_list_empty(&pool->pool_list));
                 LASSERT(pool->pool_proc_entry == NULL);
-                lov_ost_pool_free(&(pool->pool_rr.lqr_pool));
                 lov_ost_pool_free(&(pool->pool_obds));
                 OBD_FREE_PTR(pool);
                 EXIT;
@@ -460,11 +459,6 @@ int lov_pool_new(struct obd_device *obd, char *poolname)
         if (rc)
                GOTO(out_err, rc);
 
-        memset(&(new_pool->pool_rr), 0, sizeof(struct lov_qos_rr));
-        rc = lov_ost_pool_init(&new_pool->pool_rr.lqr_pool, 0);
-        if (rc)
-                GOTO(out_free_pool_obds, rc);
-
         CFS_INIT_HLIST_NODE(&new_pool->pool_hash);
 
 #ifdef LPROCFS
@@ -507,14 +501,11 @@ out_err:
        cfs_list_del_init(&new_pool->pool_list);
        lov->lov_pool_count--;
        spin_unlock(&obd->obd_dev_lock);
-
         lprocfs_remove(&new_pool->pool_proc_entry);
+       lov_ost_pool_free(&new_pool->pool_obds);
+       OBD_FREE_PTR(new_pool);
 
-        lov_ost_pool_free(&new_pool->pool_rr.lqr_pool);
-out_free_pool_obds:
-        lov_ost_pool_free(&new_pool->pool_obds);
-        OBD_FREE_PTR(new_pool);
-        return rc;
+       return rc;
 }
 
 int lov_pool_del(struct obd_device *obd, char *poolname)
@@ -583,8 +574,6 @@ int lov_pool_add(struct obd_device *obd, char *poolname, char *ostname)
         if (rc)
                 GOTO(out, rc);
 
-        pool->pool_rr.lqr_dirty = 1;
-
         CDEBUG(D_CONFIG, "Added %s to "LOV_POOLNAMEF" as member %d\n",
                ostname, poolname,  pool_tgt_count(pool));
 
@@ -629,8 +618,6 @@ int lov_pool_remove(struct obd_device *obd, char *poolname, char *ostname)
 
         lov_ost_pool_remove(&pool->pool_obds, lov_idx);
 
-        pool->pool_rr.lqr_dirty = 1;
-
         CDEBUG(D_CONFIG, "%s removed from "LOV_POOLNAMEF"\n", ostname,
                poolname);
 
@@ -640,51 +627,3 @@ out:
         lov_pool_putref(pool);
         return rc;
 }
-
-int lov_check_index_in_pool(__u32 idx, struct pool_desc *pool)
-{
-        int i, rc;
-        ENTRY;
-
-        /* caller may no have a ref on pool if it got the pool
-         * without calling lov_find_pool() (e.g. go through the lov pool
-         * list)
-         */
-        lov_pool_getref(pool);
-
-       down_read(&pool_tgt_rw_sem(pool));
-
-        for (i = 0; i < pool_tgt_count(pool); i++) {
-                if (pool_tgt_array(pool)[i] == idx)
-                        GOTO(out, rc = 0);
-        }
-        rc = -ENOENT;
-        EXIT;
-out:
-       up_read(&pool_tgt_rw_sem(pool));
-
-        lov_pool_putref(pool);
-        return rc;
-}
-
-struct pool_desc *lov_find_pool(struct lov_obd *lov, char *poolname)
-{
-        struct pool_desc *pool;
-
-        pool = NULL;
-        if (poolname[0] != '\0') {
-                pool = cfs_hash_lookup(lov->lov_pools_hash_body, poolname);
-                if (pool == NULL)
-                        CWARN("Request for an unknown pool ("LOV_POOLNAMEF")\n",
-                              poolname);
-                if ((pool != NULL) && (pool_tgt_count(pool) == 0)) {
-                        CWARN("Request for an empty pool ("LOV_POOLNAMEF")\n",
-                               poolname);
-                        /* pool is ignored, so we remove ref on it */
-                        lov_pool_putref(pool);
-                        pool = NULL;
-                }
-        }
-        return pool;
-}
-