LU-3963 libcfs: cleanup list operations

[fs/lustre-release.git] / libcfs / libcfs / winnt / winnt-mem.c

diff --git a/libcfs/libcfs/winnt/winnt-mem.c b/libcfs/libcfs/winnt/winnt-mem.c
index 21dce7e..1e29881 100644 (file)
--- a/libcfs/libcfs/winnt/winnt-mem.c
+++ b/libcfs/libcfs/winnt/winnt-mem.c
@@ -367,7 +367,7 @@ void kmem_cache_free(struct kmem_cache *kmc, void *buf)
 }
 
 spinlock_t  shrinker_guard = {0};
-CFS_LIST_HEAD(shrinker_hdr);
+struct list_head shrinker_hdr = LIST_HEAD_INIT(shrinker_hdr);
 struct timer_list shrinker_timer = {0};
 
 struct shrinker *set_shrinker(int seeks, shrink_callback cb)
@@ -379,7 +379,7 @@ struct shrinker *set_shrinker(int seeks, shrink_callback cb)
                s->seeks = seeks;
                s->nr = 2;
                spin_lock(&shrinker_guard);
-               cfs_list_add(&s->list, &shrinker_hdr);
+               list_add(&s->list, &shrinker_hdr);
                spin_unlock(&shrinker_guard);
        }
 
@@ -391,15 +391,14 @@ void remove_shrinker(struct shrinker *s)
        struct shrinker *tmp;
        spin_lock(&shrinker_guard);
 #if TRUE
-       cfs_list_for_each_entry_typed(tmp, &shrinker_hdr,
-                                     struct shrinker, list) {
+       list_for_each_entry(tmp, &shrinker_hdr, list) {
                if (tmp == s) {
-                       cfs_list_del(&tmp->list);
+                       list_del(&tmp->list);
                        break;
                }
        }
 #else
-       cfs_list_del(&s->list);
+       list_del(&s->list);
 #endif
        spin_unlock(&shrinker_guard);
        kfree(s);
@@ -411,8 +410,7 @@ void shrinker_timer_proc(ulong_ptr_t arg)
        struct shrinker *s;
        spin_lock(&shrinker_guard);
 
-       cfs_list_for_each_entry_typed(s, &shrinker_hdr,
-                                     struct shrinker, list) {
+       list_for_each_entry(s, &shrinker_hdr, list) {
                s->cb(s->nr, __GFP_FS);
        }
        spin_unlock(&shrinker_guard);