LU-12624 obdclass: lu_tgt_descs cleanup

[fs/lustre-release.git] / lustre / lod / lod_pool.c

diff --git a/lustre/lod/lod_pool.c b/lustre/lod/lod_pool.c
index 27b945e..eb23de4 100644 (file)
--- a/lustre/lod/lod_pool.c
+++ b/lustre/lod/lod_pool.c
@@ -23,7 +23,7 @@
  * Copyright  2008 Sun Microsystems, Inc. All rights reserved
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -260,16 +260,15 @@ static void *pool_proc_next(struct seq_file *seq, void *v, loff_t *pos)
        if (*pos >= pool_tgt_count(iter->lpi_pool))
                return NULL;
 
+       OBD_FAIL_TIMEOUT(OBD_FAIL_OST_LIST_ASSERT, cfs_fail_val);
+
        /* iterate to find a non empty entry */
        prev_idx = iter->lpi_idx;
-       down_read(&pool_tgt_rw_sem(iter->lpi_pool));
        iter->lpi_idx++;
-       if (iter->lpi_idx == pool_tgt_count(iter->lpi_pool)) {
+       if (iter->lpi_idx >= pool_tgt_count(iter->lpi_pool)) {
                iter->lpi_idx = prev_idx; /* we stay on the last entry */
-               up_read(&pool_tgt_rw_sem(iter->lpi_pool));
                return NULL;
        }
-       up_read(&pool_tgt_rw_sem(iter->lpi_pool));
        (*pos)++;
        /* return != NULL to continue */
        return iter;
@@ -312,6 +311,7 @@ static void *pool_proc_start(struct seq_file *seq, loff_t *pos)
        iter->lpi_idx = 0;
 
        seq->private = iter;
+       down_read(&pool_tgt_rw_sem(pool));
        if (*pos > 0) {
                loff_t i;
                void *ptr;
@@ -346,6 +346,7 @@ static void pool_proc_stop(struct seq_file *seq, void *v)
        struct lod_pool_iterator *iter = seq->private;
 
        if (iter != NULL && iter->lpi_magic == POOL_IT_MAGIC) {
+               up_read(&pool_tgt_rw_sem(iter->lpi_pool));
                seq->private = iter->lpi_pool;
                lod_pool_putref(iter->lpi_pool);
                OBD_FREE_PTR(iter);
@@ -369,9 +370,7 @@ static int pool_proc_show(struct seq_file *seq, void *v)
        LASSERT(iter->lpi_pool != NULL);
        LASSERT(iter->lpi_idx <= pool_tgt_count(iter->lpi_pool));
 
-       down_read(&pool_tgt_rw_sem(iter->lpi_pool));
        tgt = pool_tgt(iter->lpi_pool, iter->lpi_idx);
-       up_read(&pool_tgt_rw_sem(iter->lpi_pool));
        if (tgt != NULL)
                seq_printf(seq, "%s\n", obd_uuid2str(&(tgt->ltd_uuid)));
 
@@ -465,7 +464,7 @@ void lod_dump_pool(int level, struct pool_desc *pool)
  * \retval             negative error number on failure
  */
 #define POOL_INIT_COUNT 2
-int lod_ost_pool_init(struct ost_pool *op, unsigned int count)
+int lod_ost_pool_init(struct lu_tgt_pool *op, unsigned int count)
 {
        ENTRY;
 
@@ -497,7 +496,7 @@ int lod_ost_pool_init(struct ost_pool *op, unsigned int count)
  * \retval             0 on success
  * \retval             negative error number on failure.
  */
-int lod_ost_pool_extend(struct ost_pool *op, unsigned int min_count)
+int lod_ost_pool_extend(struct lu_tgt_pool *op, unsigned int min_count)
 {
        __u32 *new;
        __u32 new_size;
@@ -535,7 +534,7 @@ int lod_ost_pool_extend(struct ost_pool *op, unsigned int min_count)
  * \retval             0 if target could be added to the pool
  * \retval             negative error if target \a idx was not added
  */
-int lod_ost_pool_add(struct ost_pool *op, __u32 idx, unsigned int min_count)
+int lod_ost_pool_add(struct lu_tgt_pool *op, __u32 idx, unsigned int min_count)
 {
        unsigned int i;
        int rc = 0;
@@ -575,7 +574,7 @@ out:
  * \retval             0 on success
  * \retval             negative error number on failure
  */
-int lod_ost_pool_remove(struct ost_pool *op, __u32 idx)
+int lod_ost_pool_remove(struct lu_tgt_pool *op, __u32 idx)
 {
        unsigned int i;
        ENTRY;
@@ -609,7 +608,7 @@ int lod_ost_pool_remove(struct ost_pool *op, __u32 idx)
  *
  * \retval             0 on success or if pool was already freed
  */
-int lod_ost_pool_free(struct ost_pool *op)
+int lod_ost_pool_free(struct lu_tgt_pool *op)
 {
        ENTRY;
 
@@ -662,7 +661,8 @@ int lod_pool_new(struct obd_device *obd, char *poolname)
        if (rc)
                GOTO(out_err, rc);
 
-       lod_qos_rr_init(&new_pool->pool_rr);
+       lu_qos_rr_init(&new_pool->pool_rr);
+
        rc = lod_ost_pool_init(&new_pool->pool_rr.lqr_pool, 0);
        if (rc)
                GOTO(out_free_pool_obds, rc);
@@ -766,11 +766,11 @@ int lod_pool_del(struct obd_device *obd, char *poolname)
  */
 int lod_pool_add(struct obd_device *obd, char *poolname, char *ostname)
 {
-       struct lod_device       *lod = lu2lod_dev(obd->obd_lu_dev);
-       struct obd_uuid          ost_uuid;
-       struct pool_desc        *pool;
-       unsigned int             idx;
-       int                      rc = -EINVAL;
+       struct lod_device *lod = lu2lod_dev(obd->obd_lu_dev);
+       struct obd_uuid ost_uuid;
+       struct pool_desc *pool;
+       struct lu_tgt_desc *tgt;
+       int rc = -EINVAL;
        ENTRY;
 
        pool = cfs_hash_lookup(lod->lod_pools_hash_body, poolname);
@@ -781,8 +781,8 @@ int lod_pool_add(struct obd_device *obd, char *poolname, char *ostname)
 
        /* search ost in lod array */
        lod_getref(&lod->lod_ost_descs);
-       lod_foreach_ost(lod, idx) {
-               if (obd_uuid_equals(&ost_uuid, &OST_TGT(lod, idx)->ltd_uuid)) {
+       lod_foreach_ost(lod, tgt) {
+               if (obd_uuid_equals(&ost_uuid, &tgt->ltd_uuid)) {
                        rc = 0;
                        break;
                }
@@ -791,7 +791,8 @@ int lod_pool_add(struct obd_device *obd, char *poolname, char *ostname)
        if (rc)
                GOTO(out, rc);
 
-       rc = lod_ost_pool_add(&pool->pool_obds, idx, lod->lod_osts_size);
+       rc = lod_ost_pool_add(&pool->pool_obds, tgt->ltd_index,
+                             lod->lod_ost_descs.ltd_tgts_size);
        if (rc)
                GOTO(out, rc);
 
@@ -823,11 +824,11 @@ out:
  */
 int lod_pool_remove(struct obd_device *obd, char *poolname, char *ostname)
 {
-       struct lod_device       *lod = lu2lod_dev(obd->obd_lu_dev);
-       struct obd_uuid          ost_uuid;
-       struct pool_desc        *pool;
-       unsigned int             idx;
-       int                      rc = -EINVAL;
+       struct lod_device *lod = lu2lod_dev(obd->obd_lu_dev);
+       struct lu_tgt_desc *ost;
+       struct obd_uuid ost_uuid;
+       struct pool_desc *pool;
+       int rc = -EINVAL;
        ENTRY;
 
        pool = cfs_hash_lookup(lod->lod_pools_hash_body, poolname);
@@ -837,8 +838,8 @@ int lod_pool_remove(struct obd_device *obd, char *poolname, char *ostname)
        obd_str2uuid(&ost_uuid, ostname);
 
        lod_getref(&lod->lod_ost_descs);
-       cfs_foreach_bit(lod->lod_ost_bitmap, idx) {
-               if (obd_uuid_equals(&ost_uuid, &OST_TGT(lod, idx)->ltd_uuid)) {
+       lod_foreach_ost(lod, ost) {
+               if (obd_uuid_equals(&ost_uuid, &ost->ltd_uuid)) {
                        rc = 0;
                        break;
                }
@@ -848,7 +849,7 @@ int lod_pool_remove(struct obd_device *obd, char *poolname, char *ostname)
        if (rc)
                GOTO(out, rc);
 
-       lod_ost_pool_remove(&pool->pool_obds, idx);
+       lod_ost_pool_remove(&pool->pool_obds, ost->ltd_index);
 
        pool->pool_rr.lqr_dirty = 1;