liblustre compiling fixes:

 - define llog related to null in user space
 - various fixes in user space

diff --git a/lustre/ptlrpc/recov_thread.c b/lustre/ptlrpc/recov_thread.c
index 7fb88f2..a9fc0d8 100644 (file)
--- a/lustre/ptlrpc/recov_thread.c
+++ b/lustre/ptlrpc/recov_thread.c
@@ -32,12 +32,14 @@
 # define EXPORT_SYMTAB
 #endif
 
-#ifndef __KERNEL__
+#ifdef __KERNEL__
+#include <linux/fs.h>
+#else
 # include <portals/list.h>
 # include <liblustre.h>
 #endif
+
 #include <linux/kp30.h>
-#include <linux/fs.h>
 #include <linux/obd_class.h>
 #include <linux/lustre_commit_confd.h>
 #include <linux/obd_support.h>
@@ -48,6 +50,8 @@
 #include <linux/lustre_log.h>
 #include "ptlrpc_internal.h"
 
+#ifdef __KERNEL__
+
 static struct llog_commit_master lustre_lcm;
 static struct llog_commit_master *lcm = &lustre_lcm;
 
@@ -412,3 +416,13 @@ int llog_cleanup_commit_master(int force)
                                  atomic_read(&lcm->lcm_thread_total) == 0);
         return 0;
 }
+
+#else /* !__KERNEL__ */
+
+int llog_obd_repl_cancel(struct obd_device *obd,
+                         struct lov_stripe_md *lsm, int count,
+                         struct llog_cookie *cookies, int flags)
+{
+        return 0;
+}
+#endif