X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flod%2Flod_pool.c;h=c1426f36ff42d5eef925e6798fced8fbb8f9f1e2;hp=c9a008f448635664b473f554d0d0903b38812a68;hb=f843facff59226d3788d855d1d6948523ab8d944;hpb=3b5fc14da24a5c78346c2f42ea61b51c1d8c6191

diff --git a/lustre/lod/lod_pool.c b/lustre/lod/lod_pool.c
index c9a008f..c1426f3 100644
--- 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/
@@ -140,7 +140,8 @@ static void pool_putref_locked(struct pool_desc *pool)
  *
  * \retval		computed hash value from \a key and limited by \a mask
  */
-static __u32 pool_hashfn(cfs_hash_t *hash_body, const void *key, unsigned mask)
+static __u32 pool_hashfn(struct cfs_hash *hash_body, const void *key,
+			 unsigned mask)
 {
 	return cfs_hash_djb2_hash(key, strnlen(key, LOV_MAXPOOLNAME), mask);
 }
@@ -195,7 +196,7 @@ static void *pool_hashobject(struct hlist_node *hnode)
 	return hlist_entry(hnode, struct pool_desc, pool_hash);
 }
 
-static void pool_hashrefcount_get(cfs_hash_t *hs, struct hlist_node *hnode)
+static void pool_hashrefcount_get(struct cfs_hash *hs, struct hlist_node *hnode)
 {
 	struct pool_desc *pool;
 
@@ -203,7 +204,7 @@ static void pool_hashrefcount_get(cfs_hash_t *hs, struct hlist_node *hnode)
 	pool_getref(pool);
 }
 
-static void pool_hashrefcount_put_locked(cfs_hash_t *hs,
+static void pool_hashrefcount_put_locked(struct cfs_hash *hs,
 					 struct hlist_node *hnode)
 {
 	struct pool_desc *pool;
@@ -212,7 +213,7 @@ static void pool_hashrefcount_put_locked(cfs_hash_t *hs,
 	pool_putref_locked(pool);
 }
 
-cfs_hash_ops_t pool_hash_operations = {
+struct cfs_hash_ops pool_hash_operations = {
 	.hs_hash	= pool_hashfn,
 	.hs_key		= pool_key,
 	.hs_keycmp	= pool_hashkey_keycmp,
@@ -259,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;
@@ -311,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;
@@ -345,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);
@@ -368,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)));
 
@@ -473,8 +473,8 @@ int lod_ost_pool_init(struct ost_pool *op, unsigned int count)
 	op->op_array = NULL;
 	op->op_count = 0;
 	init_rwsem(&op->op_rw_sem);
-	op->op_size = count;
-	OBD_ALLOC(op->op_array, op->op_size * sizeof(op->op_array[0]));
+	op->op_size = count * sizeof(op->op_array[0]);
+	OBD_ALLOC(op->op_array, op->op_size);
 	if (op->op_array == NULL) {
 		op->op_size = 0;
 		RETURN(-ENOMEM);
@@ -499,21 +499,22 @@ int lod_ost_pool_init(struct ost_pool *op, unsigned int count)
 int lod_ost_pool_extend(struct ost_pool *op, unsigned int min_count)
 {
 	__u32 *new;
-	int new_size;
+	__u32 new_size;
 
 	LASSERT(min_count != 0);
 
-	if (op->op_count < op->op_size)
+	if (op->op_count * sizeof(op->op_array[0]) < op->op_size)
 		return 0;
 
-	new_size = max(min_count, 2 * op->op_size);
-	OBD_ALLOC(new, new_size * sizeof(op->op_array[0]));
+	new_size = max_t(__u32, min_count * sizeof(op->op_array[0]),
+			 2 * op->op_size);
+	OBD_ALLOC(new, new_size);
 	if (new == NULL)
 		return -ENOMEM;
 
 	/* copy old array to new one */
-	memcpy(new, op->op_array, op->op_size * sizeof(op->op_array[0]));
-	OBD_FREE(op->op_array, op->op_size * sizeof(op->op_array[0]));
+	memcpy(new, op->op_array, op->op_size);
+	OBD_FREE(op->op_array, op->op_size);
 	op->op_array = new;
 	op->op_size = new_size;
 
@@ -616,7 +617,7 @@ int lod_ost_pool_free(struct ost_pool *op)
 
 	down_write(&op->op_rw_sem);
 
-	OBD_FREE(op->op_array, op->op_size * sizeof(op->op_array[0]));
+	OBD_FREE(op->op_array, op->op_size);
 	op->op_array = NULL;
 	op->op_count = 0;
 	op->op_size = 0;
@@ -660,14 +661,15 @@ int lod_pool_new(struct obd_device *obd, char *poolname)
 	if (rc)
 		GOTO(out_err, rc);
 
-	memset(&new_pool->pool_rr, 0, sizeof(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);
 
 	INIT_HLIST_NODE(&new_pool->pool_hash);
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
 	pool_getref(new_pool);
 	new_pool->pool_proc_entry = lprocfs_add_simple(lod->lod_pool_proc_entry,
 						       poolname, new_pool,