LU-812 compat: SPIN/RW_LOCK_UNLOCKED no longer exist

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

diff --git a/libcfs/include/libcfs/user-lock.h b/libcfs/include/libcfs/user-lock.h
index 4d35823..dbb97ff 100644 (file)
--- a/libcfs/include/libcfs/user-lock.h
+++ b/libcfs/include/libcfs/user-lock.h
@@ -86,7 +86,7 @@ struct cfs_spin_lock {int foo;};
 
 typedef struct cfs_spin_lock cfs_spinlock_t;
 
-#define CFS_SPIN_LOCK_UNLOCKED (cfs_spinlock_t) { }
+#define DEFINE_SPINLOCK(lock)          cfs_spinlock_t lock = { }
 #define LASSERT_SPIN_LOCKED(lock) do {(void)sizeof(lock);} while(0)
 #define LINVRNT_SPIN_LOCKED(lock) do {(void)sizeof(lock);} while(0)
 #define LASSERT_SEM_LOCKED(sem) do {(void)sizeof(sem);} while(0)
@@ -205,7 +205,7 @@ void cfs_fini_rwsem(cfs_rw_semaphore_t *s);
  * - cfs_read_unlock_irqrestore(x)
  */
 typedef cfs_rw_semaphore_t cfs_rwlock_t;
-#define CFS_RW_LOCK_UNLOCKED        (cfs_rwlock_t) { }
+#define DEFINE_RWLOCK(lock)    cfs_rwlock_t lock = { }
 
 #define cfs_rwlock_init(pl)         cfs_init_rwsem(pl)