X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Fwinnt%2Fwinnt-curproc.c;h=16b47b80650455f8b97473ef9741ee2db9f9cef3;hb=cdaeb287ec52b54aab62ff465518c9d98ee3736b;hp=5b07ffa4314d47cc91545692c090d7955ca2d8c0;hpb=b418bd36742a4c1d3f28dd2ee5823d54ece76035;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/winnt/winnt-curproc.c b/libcfs/libcfs/winnt/winnt-curproc.c
index 5b07ffa..16b47b8 100644
--- a/libcfs/libcfs/winnt/winnt-curproc.c
+++ b/libcfs/libcfs/winnt/winnt-curproc.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.
  */
 /*
@@ -206,7 +204,7 @@ task_manager_notify(
     PLIST_ENTRY ListEntry = NULL; 
     PTASK_SLOT  TaskSlot  = NULL;
 
-    spin_lock(&(cfs_win_task_manger.Lock));
+    cfs_spin_lock(&(cfs_win_task_manger.Lock));
 
     ListEntry = cfs_win_task_manger.TaskList.Flink;
     while (ListEntry != (&(cfs_win_task_manger.TaskList))) {
@@ -228,7 +226,7 @@ task_manager_notify(
         ListEntry = ListEntry->Flink;
     }
 
-    spin_unlock(&(cfs_win_task_manger.Lock));
+    cfs_spin_unlock(&(cfs_win_task_manger.Lock));
 }
 
 int
@@ -241,7 +239,7 @@ init_task_manager()
     cfs_win_task_manger.Magic = TASKMAN_MAGIC;
 
     /* initialize the spinlock protection */
-    spin_lock_init(&cfs_win_task_manger.Lock);
+    cfs_spin_lock_init(&cfs_win_task_manger.Lock);
 
     /* create slab memory cache */
     cfs_win_task_manger.slab = cfs_mem_cache_create(
@@ -287,7 +285,7 @@ cleanup_task_manager()
     }
 
     /* cleanup all the taskslots attached to the list */
-    spin_lock(&(cfs_win_task_manger.Lock));
+    cfs_spin_lock(&(cfs_win_task_manger.Lock));
 
     while (!IsListEmpty(&(cfs_win_task_manger.TaskList))) {
 
@@ -298,7 +296,7 @@ cleanup_task_manager()
         cleanup_task_slot(TaskSlot);
     }
 
-    spin_unlock(&cfs_win_task_manger.Lock);
+    cfs_spin_unlock(&cfs_win_task_manger.Lock);
 
     /* destroy the taskslot cache slab */
     cfs_mem_cache_destroy(cfs_win_task_manger.slab);
@@ -321,7 +319,7 @@ cfs_current()
     PLIST_ENTRY ListEntry = NULL; 
     PTASK_SLOT  TaskSlot  = NULL;
 
-    spin_lock(&(cfs_win_task_manger.Lock));
+    cfs_spin_lock(&(cfs_win_task_manger.Lock));
 
     ListEntry = cfs_win_task_manger.TaskList.Flink;
     while (ListEntry != (&(cfs_win_task_manger.TaskList))) {
@@ -417,7 +415,7 @@ cfs_current()
 
 errorout:
 
-    spin_unlock(&(cfs_win_task_manger.Lock));
+    cfs_spin_unlock(&(cfs_win_task_manger.Lock));
 
     if (!TaskSlot) {
         cfs_enter_debugger();
@@ -431,17 +429,11 @@ errorout:
 void
 cfs_pause(cfs_duration_t ticks)
 {
-    cfs_schedule_timeout(CFS_TASK_UNINTERRUPTIBLE, ticks);
-}
-
-void
-our_cond_resched()
-{
-    cfs_schedule_timeout(CFS_TASK_UNINTERRUPTIBLE, 1i64);
+    cfs_schedule_timeout_and_set_state(CFS_TASK_UNINTERRUPTIBLE, ticks);
 }
 
 void
-cfs_schedule_timeout(cfs_task_state_t state, int64_t time)
+cfs_schedule_timeout_and_set_state(cfs_task_state_t state, int64_t time)
 {
     cfs_task_t * task = cfs_current();
     PTASK_SLOT   slot = NULL;
@@ -464,7 +456,7 @@ cfs_schedule_timeout(cfs_task_state_t state, int64_t time)
 void
 cfs_schedule()
 {
-    cfs_schedule_timeout(CFS_TASK_UNINTERRUPTIBLE, 0);
+    cfs_schedule_timeout_and_set_state(CFS_TASK_UNINTERRUPTIBLE, 0);
 }
 
 int