X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fliblustre.h;h=79ffd505c18ecf45fa9dc130b5e6f44947701510;hb=14765d2816bafa2a08879ece0e33bf8c97f84948;hp=388de36a204bb315a530f3b9557d0565f78a7748;hpb=c1f6b32958c799412c830f35f8d16ed7275407ea;p=fs%2Flustre-release.git

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index 388de36..79ffd50 100644
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -34,9 +34,8 @@
 #define __LINUX_SPINLOCK_H
 #endif
 
-#include <libcfs/list.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
-#include <libcfs/kp30.h>
 #include <libcfs/user-bitops.h>
 
 #include <sys/mman.h>
@@ -66,9 +65,9 @@
 #include <fcntl.h>
 #include <assert.h>
 
+#include <libcfs/libcfs.h>
 #include <libcfs/list.h>
 #include <lnet/lnet.h>
-#include <libcfs/kp30.h>
 #include <libcfs/user-bitops.h>
 
 #ifndef _IOWR
@@ -281,7 +280,7 @@ typedef spinlock_t rwlock_t;
 #define read_unlock(l)          spin_unlock(l)
 #define write_lock(l)           spin_lock(l)
 #define write_unlock(l)         spin_unlock(l)
-
+#define rwlock_init(l)          spin_lock_init(l)
 
 #define min(x,y) ((x)<(y) ? (x) : (y))
 #define max(x,y) ((x)>(y) ? (x) : (y))