LU-12538 lod: Add missed qos_rr_init

[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..c1426f3 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)));
 
@@ -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);