LU-12624 obdclass: lu_tgt_descs cleanup

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

diff --git a/lustre/lov/lov_pool.c b/lustre/lov/lov_pool.c
index 7a2b9ac..be35bd7 100644 (file)
--- a/lustre/lov/lov_pool.c
+++ b/lustre/lov/lov_pool.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. 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/
@@ -151,7 +151,6 @@ struct cfs_hash_ops pool_hash_operations = {
 };
 
 #ifdef CONFIG_PROC_FS
-/* ifdef needed for liblustre support */
 /*
  * pool /proc seq_file methods
  */
@@ -181,14 +180,11 @@ static void *pool_proc_next(struct seq_file *s, void *v, loff_t *pos)
 
         /* iterate to find a non empty entry */
         prev_idx = iter->idx;
-       down_read(&pool_tgt_rw_sem(iter->pool));
         iter->idx++;
-        if (iter->idx == pool_tgt_count(iter->pool)) {
+       if (iter->idx >= pool_tgt_count(iter->pool)) {
                 iter->idx = prev_idx; /* we stay on the last entry */
-               up_read(&pool_tgt_rw_sem(iter->pool));
                 return NULL;
         }
-       up_read(&pool_tgt_rw_sem(iter->pool));
         (*pos)++;
         /* return != NULL to continue */
         return iter;
@@ -219,6 +215,7 @@ static void *pool_proc_start(struct seq_file *s, loff_t *pos)
          * we can free it at stop() */
         /* /!\ do not forget to restore it to pool before freeing it */
         s->private = iter;
+       down_read(&pool_tgt_rw_sem(pool));
         if (*pos > 0) {
                 loff_t i;
                 void *ptr;
@@ -240,6 +237,7 @@ static void pool_proc_stop(struct seq_file *s, void *v)
          * calling start() method (see seq_read() from fs/seq_file.c)
          * we have to free only if s->private is an iterator */
         if ((iter) && (iter->magic == POOL_IT_MAGIC)) {
+               up_read(&pool_tgt_rw_sem(iter->pool));
                 /* we restore s->private so next call to pool_proc_start()
                  * will work */
                 s->private = iter->pool;
@@ -258,9 +256,7 @@ static int pool_proc_show(struct seq_file *s, void *v)
        LASSERT(iter->pool != NULL);
        LASSERT(iter->idx <= pool_tgt_count(iter->pool));
 
-       down_read(&pool_tgt_rw_sem(iter->pool));
         tgt = pool_tgt(iter->pool, iter->idx);
-       up_read(&pool_tgt_rw_sem(iter->pool));
         if (tgt)
                 seq_printf(s, "%s\n", obd_uuid2str(&(tgt->ltd_uuid)));
 
@@ -317,7 +313,7 @@ void lov_dump_pool(int level, struct pool_desc *pool)
 }
 
 #define LOV_POOL_INIT_COUNT 2
-int lov_ost_pool_init(struct ost_pool *op, unsigned int count)
+int lov_ost_pool_init(struct lu_tgt_pool *op, unsigned int count)
 {
        ENTRY;
 
@@ -337,7 +333,7 @@ int lov_ost_pool_init(struct ost_pool *op, unsigned int count)
 }
 
 /* Caller must hold write op_rwlock */
-int lov_ost_pool_extend(struct ost_pool *op, unsigned int min_count)
+int lov_ost_pool_extend(struct lu_tgt_pool *op, unsigned int min_count)
 {
        __u32 *new;
        __u32 new_size;
@@ -361,7 +357,7 @@ int lov_ost_pool_extend(struct ost_pool *op, unsigned int min_count)
        return 0;
 }
 
-int lov_ost_pool_add(struct ost_pool *op, __u32 idx, unsigned int min_count)
+int lov_ost_pool_add(struct lu_tgt_pool *op, __u32 idx, unsigned int min_count)
 {
         int rc = 0, i;
         ENTRY;
@@ -386,7 +382,7 @@ out:
         return rc;
 }
 
-int lov_ost_pool_remove(struct ost_pool *op, __u32 idx)
+int lov_ost_pool_remove(struct lu_tgt_pool *op, __u32 idx)
 {
         int i;
         ENTRY;
@@ -408,7 +404,7 @@ int lov_ost_pool_remove(struct ost_pool *op, __u32 idx)
         RETURN(-EINVAL);
 }
 
-int lov_ost_pool_free(struct ost_pool *op)
+int lov_ost_pool_free(struct lu_tgt_pool *op)
 {
        ENTRY;
 
@@ -548,7 +544,7 @@ int lov_pool_add(struct obd_device *obd, char *poolname, char *ostname)
 
 
         /* search ost in lov array */
-        obd_getref(obd);
+       lov_tgts_getref(obd);
         for (lov_idx = 0; lov_idx < lov->desc.ld_tgt_count; lov_idx++) {
                 if (!lov->lov_tgts[lov_idx])
                         continue;
@@ -569,9 +565,10 @@ int lov_pool_add(struct obd_device *obd, char *poolname, char *ostname)
 
         EXIT;
 out:
-        obd_putref(obd);
-        lov_pool_putref(pool);
-        return rc;
+       lov_tgts_putref(obd);
+       lov_pool_putref(pool);
+
+       return rc;
 }
 
 int lov_pool_remove(struct obd_device *obd, char *poolname, char *ostname)
@@ -591,7 +588,7 @@ int lov_pool_remove(struct obd_device *obd, char *poolname, char *ostname)
 
         obd_str2uuid(&ost_uuid, ostname);
 
-        obd_getref(obd);
+       lov_tgts_getref(obd);
         /* search ost in lov array, to get index */
         for (lov_idx = 0; lov_idx < lov->desc.ld_tgt_count; lov_idx++) {
                 if (!lov->lov_tgts[lov_idx])
@@ -613,7 +610,8 @@ int lov_pool_remove(struct obd_device *obd, char *poolname, char *ostname)
 
         EXIT;
 out:
-        obd_putref(obd);
-        lov_pool_putref(pool);
-        return rc;
+       lov_tgts_putref(obd);
+       lov_pool_putref(pool);
+
+       return rc;
 }