use special macro for print time_t, cleanup in includes.

[fs/lustre-release.git] / lnet / libcfs / user-prim.c

diff --git a/lnet/libcfs/user-prim.c b/lnet/libcfs/user-prim.c
index 2dad1b3..5193745 100644 (file)
--- 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;
@@ -378,7 +380,6 @@ void lbug_with_loc(char *file, const char *func, const int line)
         abort();
 }
 
-
 /* !__KERNEL__ */
 #endif