LU-4199 libcfs: remove assertion of spin_is_locked()

[fs/lustre-release.git] / libcfs / include / libcfs / winnt / winnt-lock.h

diff --git a/libcfs/include/libcfs/winnt/winnt-lock.h b/libcfs/include/libcfs/winnt/winnt-lock.h
index 7a5e9fe..23f93c3 100644 (file)
--- a/libcfs/include/libcfs/winnt/winnt-lock.h
+++ b/libcfs/include/libcfs/winnt/winnt-lock.h
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -62,31 +64,31 @@ typedef struct spin_lock spinlock_t;
 
 /* atomic */
 
-typedef struct { volatile int counter; } cfs_atomic_t;
+typedef struct { volatile int counter; } atomic_t;
 
-#define CFS_ATOMIC_INIT(i)     { i }
+#define ATOMIC_INIT(i) { i }
 
-#define cfs_atomic_read(v)     ((v)->counter)
-#define cfs_atomic_set(v,i)    (((v)->counter) = (i))
+#define atomic_read(v) ((v)->counter)
+#define atomic_set(v,i)        (((v)->counter) = (i))
 
-void FASTCALL cfs_atomic_add(int i, cfs_atomic_t *v);
-void FASTCALL cfs_atomic_sub(int i, cfs_atomic_t *v);
+void FASTCALL atomic_add(int i, atomic_t *v);
+void FASTCALL atomic_sub(int i, atomic_t *v);
 
-int FASTCALL cfs_atomic_sub_and_test(int i, cfs_atomic_t *v);
+int FASTCALL atomic_sub_and_test(int i, atomic_t *v);
 
-void FASTCALL cfs_atomic_inc(cfs_atomic_t *v);
-void FASTCALL cfs_atomic_dec(cfs_atomic_t *v);
+void FASTCALL atomic_inc(atomic_t *v);
+void FASTCALL atomic_dec(atomic_t *v);
 
-int FASTCALL cfs_atomic_dec_and_test(cfs_atomic_t *v);
-int FASTCALL cfs_atomic_inc_and_test(cfs_atomic_t *v);
+int FASTCALL atomic_dec_and_test(atomic_t *v);
+int FASTCALL atomic_inc_and_test(atomic_t *v);
 
-int FASTCALL cfs_atomic_add_return(int i, cfs_atomic_t *v);
-int FASTCALL cfs_atomic_sub_return(int i, cfs_atomic_t *v);
+int FASTCALL atomic_add_return(int i, atomic_t *v);
+int FASTCALL atomic_sub_return(int i, atomic_t *v);
 
-#define cfs_atomic_inc_return(v)  cfs_atomic_add_return(1, v)
-#define cfs_atomic_dec_return(v)  cfs_atomic_sub_return(1, v)
+#define atomic_inc_return(v)  atomic_add_return(1, v)
+#define atomic_dec_return(v)  atomic_sub_return(1, v)
 
-int FASTCALL cfs_atomic_dec_and_lock(cfs_atomic_t *v, spinlock_t *lock);
+int FASTCALL atomic_dec_and_lock(atomic_t *v, spinlock_t *lock);
 
 /* event */
 
@@ -142,7 +144,7 @@ cfs_wait_event_internal(event_t * event, int64_t timeout)
     NTSTATUS        Status;
     LARGE_INTEGER   TimeOut;
 
-    TimeOut.QuadPart = -1 * (10000000/CFS_HZ) * timeout;
+    TimeOut.QuadPart = -1 * (10000000/HZ) * timeout;
 
     Status = KeWaitForSingleObject(
                 event,
@@ -296,7 +298,7 @@ static int spin_trylock(spinlock_t *lock)
        return rc;
 }
 
-static int spin_is_locked(spinlock_t *lock)
+static int assert_spin_locked(spinlock_t *lock)
 {
 #if _WIN32_WINNT >= 0x502
        /* KeTestSpinLock only avalilable on 2k3 server or later */
@@ -578,8 +580,8 @@ static inline int down_trylock(struct semaphore *s)
  *
  * - init_mutex(x)
  * - init_mutex_locked(x)
- * - mutex_up(x)
- * - mutex_down(x)
+ * - mutex_unlock(x)
+ * - mutex_lock(x)
  */
 
 #define mutex semaphore