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

diff --git a/lustre/lod/lod_pool.c b/lustre/lod/lod_pool.c
index 3bebbfe..da5389c 100644
--- a/lustre/lod/lod_pool.c
+++ b/lustre/lod/lod_pool.c
@@ -96,8 +96,8 @@ void lod_pool_putref(struct pool_desc *pool)
 {
 	CDEBUG(D_INFO, "pool %p\n", pool);
 	if (atomic_dec_and_test(&pool->pool_refcount)) {
-		LASSERT(cfs_hlist_unhashed(&pool->pool_hash));
-		LASSERT(cfs_list_empty(&pool->pool_list));
+		LASSERT(hlist_unhashed(&pool->pool_hash));
+		LASSERT(list_empty(&pool->pool_list));
 		LASSERT(pool->pool_proc_entry == NULL);
 		lod_ost_pool_free(&(pool->pool_rr.lqr_pool));
 		lod_ost_pool_free(&(pool->pool_obds));
@@ -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);
 }
@@ -154,11 +155,11 @@ static __u32 pool_hashfn(cfs_hash_t *hash_body, const void *key, unsigned mask)
  *
  * \retval		char array referencing the pool name (no refcount)
  */
-static void *pool_key(cfs_hlist_node_t *hnode)
+static void *pool_key(struct hlist_node *hnode)
 {
 	struct pool_desc *pool;
 
-	pool = cfs_hlist_entry(hnode, struct pool_desc, pool_hash);
+	pool = hlist_entry(hnode, struct pool_desc, pool_hash);
 	return pool->pool_name;
 }
 
@@ -174,7 +175,7 @@ static void *pool_key(cfs_hlist_node_t *hnode)
  * \retval		0 if \a key is the same as the key of \a compared
  * \retval		1 if \a key is different from the key of \a compared
  */
-static int pool_hashkey_keycmp(const void *key, cfs_hlist_node_t *compared)
+static int pool_hashkey_keycmp(const void *key, struct hlist_node *compared)
 {
 	return !strncmp(key, pool_key(compared), LOV_MAXPOOLNAME);
 }
@@ -190,29 +191,29 @@ static int pool_hashkey_keycmp(const void *key, cfs_hlist_node_t *compared)
  *
  * \retval		struct pool_desc for the specified \a hnode
  */
-static void *pool_hashobject(cfs_hlist_node_t *hnode)
+static void *pool_hashobject(struct hlist_node *hnode)
 {
-	return cfs_hlist_entry(hnode, struct pool_desc, pool_hash);
+	return hlist_entry(hnode, struct pool_desc, pool_hash);
 }
 
-static void pool_hashrefcount_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode)
+static void pool_hashrefcount_get(struct cfs_hash *hs, struct hlist_node *hnode)
 {
 	struct pool_desc *pool;
 
-	pool = cfs_hlist_entry(hnode, struct pool_desc, pool_hash);
+	pool = hlist_entry(hnode, struct pool_desc, pool_hash);
 	pool_getref(pool);
 }
 
-static void pool_hashrefcount_put_locked(cfs_hash_t *hs,
-					 cfs_hlist_node_t *hnode)
+static void pool_hashrefcount_put_locked(struct cfs_hash *hs,
+					 struct hlist_node *hnode)
 {
 	struct pool_desc *pool;
 
-	pool = cfs_hlist_entry(hnode, struct pool_desc, pool_hash);
+	pool = hlist_entry(hnode, struct pool_desc, pool_hash);
 	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,
@@ -660,21 +661,17 @@ 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));
+	lod_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,
-#ifndef HAVE_ONLY_PROCFS_SEQ
-						       NULL, NULL,
-#endif
-						       new_pool,
+						       poolname, new_pool,
 						       &pool_proc_operations);
 	if (IS_ERR(new_pool->pool_proc_entry)) {
 		CDEBUG(D_CONFIG, "%s: cannot add proc entry "LOV_POOLNAMEF"\n",
@@ -687,7 +684,7 @@ int lod_pool_new(struct obd_device *obd, char *poolname)
 #endif
 
 	spin_lock(&obd->obd_dev_lock);
-	cfs_list_add_tail(&new_pool->pool_list, &lod->lod_pool_list);
+	list_add_tail(&new_pool->pool_list, &lod->lod_pool_list);
 	lod->lod_pool_count++;
 	spin_unlock(&obd->obd_dev_lock);
 
@@ -704,7 +701,7 @@ int lod_pool_new(struct obd_device *obd, char *poolname)
 
 out_err:
 	spin_lock(&obd->obd_dev_lock);
-	cfs_list_del_init(&new_pool->pool_list);
+	list_del_init(&new_pool->pool_list);
 	lod->lod_pool_count--;
 	spin_unlock(&obd->obd_dev_lock);
 
@@ -744,7 +741,7 @@ int lod_pool_del(struct obd_device *obd, char *poolname)
 	}
 
 	spin_lock(&obd->obd_dev_lock);
-	cfs_list_del_init(&pool->pool_list);
+	list_del_init(&pool->pool_list);
 	lod->lod_pool_count--;
 	spin_unlock(&obd->obd_dev_lock);