- suse-2.4.21 builds on x86_64 now

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

diff --git a/lustre/obdclass/uuid.c b/lustre/obdclass/uuid.c
index bf0da7d..2226f90 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;
@@ -41,7 +48,7 @@ static void uuid_unpack(class_uuid_t in, struct uuid *uu)
        tmp = *ptr++;
        tmp = (tmp << 8) | *ptr++;
        uu->time_mid = tmp;
-       
+
        tmp = *ptr++;
        tmp = (tmp << 8) | *ptr++;
        uu->time_hi_and_version = tmp;
@@ -53,6 +60,7 @@ static void uuid_unpack(class_uuid_t in, struct uuid *uu)
        memcpy(uu->node, ptr, 6);
 }
 
+#if 0
 static void uuid_pack(struct uuid *uu, class_uuid_t ptr)
 {
        __u32   tmp;
@@ -66,7 +74,7 @@ static void uuid_pack(struct uuid *uu, class_uuid_t ptr)
        out[1] = (unsigned char) tmp;
        tmp >>= 8;
        out[0] = (unsigned char) tmp;
-       
+
        tmp = uu->time_mid;
        out[5] = (unsigned char) tmp;
        tmp >>= 8;
@@ -85,7 +93,7 @@ static void uuid_pack(struct uuid *uu, class_uuid_t ptr)
        memcpy(out+10, uu->node, 6);
 }
 
-int class_uuid_parse(char *in, class_uuid_t uu)
+int class_uuid_parse(struct obd_uuid in, class_uuid_t uu)
 {
        struct uuid uuid;
        int i;
@@ -115,20 +123,44 @@ int class_uuid_parse(char *in, class_uuid_t uu)
                buf[1] = *cp++;
                uuid.node[i] = simple_strtoul(buf, NULL, 16);
        }
-       
+
        uuid_pack(&uuid, uu);
        return 0;
 }
+#endif
 
-void class_uuid_unparse(class_uuid_t uu, char *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,
                uuid.node[0], uuid.node[1], uuid.node[2],
                uuid.node[3], uuid.node[4], uuid.node[5]);
 }
+
+struct obd_device *client_tgtuuid2obd(struct obd_uuid *tgtuuid)
+{
+        int i;
+
+        for (i = 0; i < MAX_OBD_DEVICES; i++) {
+                struct obd_device *obd = &obd_dev[i];
+                if (obd->obd_type == NULL)
+                        continue;
+                if ((strncmp(obd->obd_type->typ_name, LUSTRE_OSC_NAME,
+                             sizeof LUSTRE_OSC_NAME) == 0) ||
+                    (strncmp(obd->obd_type->typ_name, LUSTRE_MDC_NAME,
+                             sizeof LUSTRE_MDC_NAME) == 0)) {
+                        struct client_obd *cli = &obd->u.cli;
+                        struct obd_import *imp = cli->cl_import;
+                        if (strncmp(tgtuuid->uuid, imp->imp_target_uuid.uuid,
+                                    sizeof(imp->imp_target_uuid)) == 0)
+                                return obd;
+                }
+        }
+
+        return NULL;
+}