LU-4788 lfsck: replace cfs_list_t with list_head

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

diff --git a/lustre/lod/lod_pool.c b/lustre/lod/lod_pool.c
index 3bebbfe..c54f1c8 100644 (file)
--- 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));
@@ -154,11 +154,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 +174,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,25 +190,25 @@ 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(cfs_hash_t *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)
+                                        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);
 }
 
@@ -687,7 +687,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 +704,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 +744,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);