LU-812 compat: SPIN/RW_LOCK_UNLOCKED no longer exist

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

diff --git a/libcfs/include/libcfs/linux/linux-lock.h b/libcfs/include/libcfs/linux/linux-lock.h
index 8a9f66c..cc2ca51 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-lock.h
+++ b/libcfs/include/libcfs/linux/linux-lock.h
@@ -75,8 +75,6 @@
  * - read_lock_irqsave(lock, f)
  * - write_lock_irqsave(lock, f)
  * - write_unlock_irqrestore(lock, f)
- *
- * - SPIN_LOCK_UNLOCKED
  */
 
 /*
@@ -102,8 +100,6 @@ typedef spinlock_t cfs_spinlock_t;
 #define cfs_spin_lock_irqsave(lock, f)       spin_lock_irqsave(lock, f)
 #define cfs_spin_unlock_irqrestore(lock, f)  spin_unlock_irqrestore(lock, f)
 
-#define CFS_SPIN_LOCK_UNLOCKED               SPIN_LOCK_UNLOCKED
-
 /*
  * rw_semaphore "implementation" (use Linux kernel's primitives)
  *
@@ -153,7 +149,9 @@ typedef rwlock_t cfs_rwlock_t;
 #define cfs_write_lock_bh(lock)                write_lock_bh(lock)
 #define cfs_write_unlock_bh(lock)              write_unlock_bh(lock)
 
-#define CFS_RW_LOCK_UNLOCKED                   RW_LOCK_UNLOCKED
+#ifndef DEFINE_RWLOCK
+#define DEFINE_RWLOCK(lock)    rwlock_t lock = __RW_LOCK_UNLOCKED(lock)
+#endif
 
 /*
  * completion "implementation" (use Linux kernel's primitives)