LU-812 compat: SPIN/RW_LOCK_UNLOCKED no longer exist

[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 4c7bd5e..169cc02 100644 (file)
--- a/libcfs/include/libcfs/winnt/winnt-lock.h
+++ b/libcfs/include/libcfs/winnt/winnt-lock.h
@@ -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.
  */
 /*
@@ -223,7 +221,7 @@ struct cfs_spin_lock {
 #define CFS_DECL_SPIN(name)  cfs_spinlock_t name;
 #define CFS_DECL_SPIN_EXTERN(name)  extern cfs_spinlock_t name;
 
-#define CFS_SPIN_LOCK_UNLOCKED {0}
+#define DEFINE_SPINLOCK {0}
 
 static inline void cfs_spin_lock_init(cfs_spinlock_t *lock)
 {
@@ -631,10 +629,17 @@ static inline void cfs_mutex_down(cfs_mutex_t *mutex)
     __down(mutex);
 }
 
-#define cfs_mutex_lock(m) cfs_mutex_down(m)
-#define cfs_mutex_trylock(s) down_trylock(s)
-#define cfs_mutex_lock_nested(m) cfs_mutex_down(m)
-#define cfs_down(m)       cfs_mutex_down(m)
+static inline int cfs_mutex_down_interruptible(cfs_mutex_t *mutex)
+{
+    __down(mutex);
+    return 0;
+}
+
+#define cfs_mutex_lock(m)         cfs_mutex_down(m)
+#define cfs_mutex_trylock(s)      down_trylock(s)
+#define cfs_mutex_lock_nested(m)  cfs_mutex_down(m)
+#define cfs_down(m)               cfs_mutex_down(m)
+#define cfs_down_interruptible(m) cfs_mutex_down_interruptible(m)
 
 /*
  * mutex_up