X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fit_test.c;h=4c5edb02f158affbe4a86f0382eeaa5e2a465fdd;hb=1d18f992d4cd1e8c9300987587974524b113847a;hp=16815e1160bb9b6f632482ef6d29965ed759fa21;hpb=0f8dca08a4f68cba82c2c822998ecc309d3b7aaf;p=fs%2Flustre-release.git diff --git a/lustre/tests/it_test.c b/lustre/tests/it_test.c index 16815e1..4c5edb0 100644 --- a/lustre/tests/it_test.c +++ b/lustre/tests/it_test.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,7 +61,7 @@ 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; @@ -379,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--); @@ -424,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; @@ -437,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); } } @@ -474,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;