X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fit_test.c;h=a31e0b3e94ede9940ba8be7e2b9b589ec763d69e;hb=8a11cb6282cfbdc8617b809344e6a11223e86a38;hp=457f7263acbf0eb793b28ef2b6a355125359acb9;hpb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431;p=fs%2Flustre-release.git diff --git a/lustre/tests/it_test.c b/lustre/tests/it_test.c index 457f726..a31e0b3 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. @@ -26,7 +24,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -45,7 +43,8 @@ #include #include -#include +#define EXPORT_SYMBOL(s) + #include <../ldlm/interval_tree.c> #define dprintf(fmt, args...) //printf(fmt, ##args) @@ -63,11 +62,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; @@ -379,7 +378,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 +423,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 +436,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 +473,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;