* Compiles after merging b1_4

[fs/lustre-release.git] / lustre / obdclass / uuid.c

diff --git a/lustre/obdclass/uuid.c b/lustre/obdclass/uuid.c
index 7048baa..dd66ae5 100644 (file)
--- a/lustre/obdclass/uuid.c
+++ b/lustre/obdclass/uuid.c
@@ -10,14 +10,21 @@
  * Library General Public License.
  * %End-Header%
  */
-#include <linux/ctype.h>
-#include <linux/kernel.h>
-
 #define DEBUG_SUBSYSTEM S_CLASS
 
+#ifdef __KERNEL__
+# include <linux/ctype.h>
+# include <linux/kernel.h>
+# include <linux/sched.h>
+# include <linux/smp_lock.h>
+#else
+# include <liblustre.h>
+#endif
+
 #include <linux/obd_support.h>
 #include <linux/obd_class.h>
-#include <linux/smp_lock.h>
+#include <linux/obd_ost.h> /* for LUSTRE_OST_NAME */
+#include <linux/lustre_mds.h> /* for LUSTRE_MDC_NAME */
 
 struct uuid {
        __u32   time_low;
@@ -86,7 +93,7 @@ static void uuid_pack(struct uuid *uu, class_uuid_t ptr)
        memcpy(out+10, uu->node, 6);
 }
 
-int class_uuid_parse(obd_uuid_t in, class_uuid_t uu)
+int class_uuid_parse(struct obd_uuid in, class_uuid_t uu)
 {
        struct uuid uuid;
        int i;
@@ -122,12 +129,12 @@ int class_uuid_parse(obd_uuid_t in, class_uuid_t uu)
 }
 #endif
 
-void class_uuid_unparse(class_uuid_t uu, obd_uuid_t out)
+void class_uuid_unparse(class_uuid_t uu, struct obd_uuid *out)
 {
        struct uuid uuid;
 
        uuid_unpack(uu, &uuid);
-       sprintf(out,
+       sprintf(out->uuid,
                "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
                uuid.time_low, uuid.time_mid, uuid.time_hi_and_version,
                uuid.clock_seq >> 8, uuid.clock_seq & 0xFF,