X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fit_test.c;h=5aad0e220d58fcb058c4be3b77f3a12b48c2a25b;hb=be60eadd9c36ae81864d9555b1719c1cf44b429d;hp=7b6906a55712b374f9ac94884e55a4d16aedb3a4;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70;p=fs%2Flustre-release.git

diff --git a/lustre/tests/it_test.c b/lustre/tests/it_test.c
index 7b6906a..5aad0e2 100644
--- a/lustre/tests/it_test.c
+++ b/lustre/tests/it_test.c
@@ -61,11 +61,11 @@
 
 static struct it_node {
         struct interval_node node;
-        cfs_list_t list;
+	struct list_head list;
         int hit, valid;
 } *it_array;
 static int it_count;
-static CFS_LIST_HEAD(header);
+static struct list_head header = LIST_HEAD_INIT(header);
 static unsigned long max_count = ULONG_MAX & ALIGN_MASK;
 static int have_wide_lock = 0;
 
@@ -377,7 +377,7 @@ static int it_test_performance(struct interval_node *root, unsigned long len)
         /* list */
         contended_count = 0;
         gettimeofday(&start, NULL);
-        cfs_list_for_each_entry(n, &header, list) {
+	list_for_each_entry(n, &header, list) {
                 if (extent_overlapped(&ext, &n->node.in_extent)) {
                         count = LOOP_COUNT;
                         while (count--);
@@ -422,7 +422,7 @@ static struct interval_node *it_test_helper(struct interval_node *root)
                                 __F(&n->node.in_extent));
                         interval_erase(&n->node, &root);
                         n->valid = 0;
-                        cfs_list_del_init(&n->list);
+			list_del_init(&n->list);
                 } else {
                         __u64 low, high;
                         low = (random() % max_count) & ALIGN_MASK;
@@ -435,7 +435,7 @@ static struct interval_node *it_test_helper(struct interval_node *root)
                         dprintf("Adding a node "__S"\n",
                                 __F(&n->node.in_extent));
                         n->valid = 1;
-                        cfs_list_add(&n->list, &header);
+			list_add(&n->list, &header);
                 }
         }
 
@@ -472,9 +472,9 @@ static struct interval_node *it_test_init(int count)
                 n->hit = 0;
                 n->valid = 1;
                 if (i == 0)
-                        cfs_list_add_tail(&n->list, &header);
+			list_add_tail(&n->list, &header);
                 else
-                        cfs_list_add_tail(&n->list, &it_array[rand()%i].list);
+			list_add_tail(&n->list, &it_array[rand()%i].list);
         }
 
         return root;