X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flibcfs%2Fuser-prim.c;h=519374585780612e134ef3c8aecc09afc13a4f37;hp=d3637184dbc951809ebd1caa89b5f4a5bd476202;hb=c1f6b32958c799412c830f35f8d16ed7275407ea;hpb=b3d5d96caee1cc67a9b79fe5e617a5e583b13593

diff --git a/lnet/libcfs/user-prim.c b/lnet/libcfs/user-prim.c
index d363718..5193745 100644
--- a/lnet/libcfs/user-prim.c
+++ b/lnet/libcfs/user-prim.c
@@ -31,6 +31,9 @@
 
 #ifndef __KERNEL__
 
+#include <libcfs/libcfs.h>
+#include <libcfs/kp30.h>
+
 #include <sys/mman.h>
 #ifndef  __CYGWIN__
 #include <stdint.h>
@@ -48,10 +51,9 @@
 #include <signal.h>
 #include <errno.h>
 #include <sys/stat.h>
+#ifdef	HAVE_SYS_VFS_H
 #include <sys/vfs.h>
-
-#include <libcfs/libcfs.h>
-#include <libcfs/kp30.h>
+#endif
 
 /*
  * Sleep channel. No-op implementation.
@@ -120,13 +122,13 @@ void cfs_waitq_signal_nr(struct cfs_waitq *waitq, int nr)
         (void)waitq;
 }
 
-void cfs_waitq_broadcast(struct cfs_waitq *waitq, int state)
+void cfs_waitq_broadcast(struct cfs_waitq *waitq)
 {
         LASSERT(waitq != NULL);
         (void)waitq;
 }
 
-void cfs_waitq_wait(struct cfs_waitlink *link)
+void cfs_waitq_wait(struct cfs_waitlink *link, int state)
 {
         LASSERT(link != NULL);
         (void)link;
@@ -276,13 +278,6 @@ void cfs_mem_cache_free(cfs_mem_cache_t *c, void *addr)
         cfs_free(addr);
 }
 
-/*
- * This uses user-visible declarations from <linux/kdev_t.h>
- */
-#ifdef __linux__
-#include <linux/kdev_t.h>
-#endif
-
 void cfs_enter_debugger(void)
 {
         /*
@@ -385,7 +380,6 @@ void lbug_with_loc(char *file, const char *func, const int line)
         abort();
 }
 
-
 /* !__KERNEL__ */
 #endif