Severity : cleanup

Bugzilla   : 13532
Description: rewrite ext2-derived code in llite/dir.c and obdclass/uuid.c
Details    : rewrite inherited code (uuid parsing code from ext2 utils and
             readdir code from ext3) from scratch preserving functionality.
b=13532
i=adilger
i=alex
i=green

lustre/ChangeLog

@@ -164,6 +164,12 @@ Details    : use adaptive algorithm for managing client cached locks lru
              pattern, memory activities, etc. Both, server and client 
              side namespaces provide number of proc tunables for controlling 
              things
+
+Severity   : cleanup
+Bugzilla   : 13532
+Description: rewrite ext2-derived code in llite/dir.c and obdclass/uuid.c
+Details    : rewrite inherited code (uuid parsing code from ext2 utils and
+             readdir code from ext3) from scratch preserving functionality.
 --------------------------------------------------------------------------------
 
 2007-08-27         Cluster File Systems, Inc. <info@clusterfs.com>

lustre/include/liblustre.h

@@ -84,6 +84,10 @@ typedef unsigned short umode_t;
 # define CURRENT_SECONDS time(0)
 #endif
 
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(a) ((sizeof (a))/(sizeof ((a)[0])))
+#endif
+
 /* This is because lprocfs_status.h gets included here indirectly.  It would
  * be much better to just avoid lprocfs being included into liblustre entirely
  * but that requires more header surgery than I can handle right now.
@@ -789,7 +793,7 @@ void *liblustre_register_wait_callback(const char *name,
 void liblustre_deregister_wait_callback(void *notifier);
 int liblustre_wait_event(int timeout);
 
-void *liblustre_register_idle_callback(const char *name, 
+void *liblustre_register_idle_callback(const char *name,
                                        int (*fn)(void *arg), void *arg);
 void liblustre_deregister_idle_callback(void *notifier);
 void liblustre_wait_idle(void);
@@ -822,7 +826,7 @@ typedef struct file_lock {
         unsigned long fl_break_time;    /* for nonblocking lease breaks */
 
         union {
-                struct nfs_lock_info    nfs_fl;       
+                struct nfs_lock_info    nfs_fl;
         } fl_u;
 } cfs_flock_t;
 

lustre/obdclass/uuid.c

 /*
  * Public include file for the UUID library
- * 
- * Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
- * Copyright (C) 2002 Cluster File System
- * - changed for use in lustre
  *
- * %Begin-Header%
- * This file may be redistributed under the terms of the GNU 
- * Library General Public License.
- * %End-Header%
+ * Copyright (C) 2007 Cluster File System
  */
+
 #define DEBUG_SUBSYSTEM S_CLASS
 
 #ifndef __KERNEL__
 # include <liblustre.h>
+#else
+# include <libcfs/kp30.h>
 #endif
 
 #include <obd_support.h>
 #include <obd_class.h>
 
-struct uuid {
-        __u32   time_low;
-        __u16   time_mid;
-        __u16   time_hi_and_version;
-        __u16   clock_seq;
-        __u8    node[6];
-};
 
-static void uuid_unpack(class_uuid_t in, struct uuid *uu)
+static inline __u32 consume(int nob, __u8 **ptr)
 {
-        __u8    *ptr = in;
-        __u32   tmp;
-
-        tmp = *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        uu->time_low = tmp;
-
-        tmp = *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        uu->time_mid = tmp;
-
-        tmp = *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        uu->time_hi_and_version = tmp;
+	__u32 value;
 
-        tmp = *ptr++;
-        tmp = (tmp << 8) | *ptr++;
-        uu->clock_seq = tmp;
+	LASSERT(nob <= sizeof value);
 
-        memcpy(uu->node, ptr, 6);
+	for (value = 0; nob > 0; --nob)
+		value = (value << 8) | *((*ptr)++);
+	return value;
 }
 
-#if 0
-static void uuid_pack(struct uuid *uu, class_uuid_t ptr)
-{
-        __u32   tmp;
-        unsigned char   *out = ptr;
-
-        tmp = uu->time_low;
-        out[3] = (unsigned char) tmp;
-        tmp >>= 8;
-        out[2] = (unsigned char) tmp;
-        tmp >>= 8;
-        out[1] = (unsigned char) tmp;
-        tmp >>= 8;
-        out[0] = (unsigned char) tmp;
-
-        tmp = uu->time_mid;
-        out[5] = (unsigned char) tmp;
-        tmp >>= 8;
-        out[4] = (unsigned char) tmp;
-
-        tmp = uu->time_hi_and_version;
-        out[7] = (unsigned char) tmp;
-        tmp >>= 8;
-        out[6] = (unsigned char) tmp;
+#define CONSUME(val, ptr) (val) = consume(sizeof(val), (ptr))
 
-        tmp = uu->clock_seq;
-        out[9] = (unsigned char) tmp;
-        tmp >>= 8;
-        out[8] = (unsigned char) tmp;
-
-        memcpy(out+10, uu->node, 6);
-}
-
-int class_uuid_parse(struct obd_uuid in, class_uuid_t uu)
+static void uuid_unpack(class_uuid_t in, __u16 *uu, int nr)
 {
-        struct uuid uuid;
-        int i;
-        char *cp, buf[3];
+        __u8 *ptr = in;
 
-        if (strlen(in) != 36)
-                return -1;
-        for (i=0, cp = in; i <= 36; i++,cp++) {
-                if ((i == 8) || (i == 13) || (i == 18) ||
-                    (i == 23))
-                        if (*cp == '-')
-                                continue;
-                if (i== 36)
-                        if (*cp == 0)
-                                continue;
-                if (!isxdigit(*cp))
-                        return -1;
-        }
-        uuid.time_low = simple_strtoul(in, NULL, 16);
-        uuid.time_mid = simple_strtoul(in+9, NULL, 16);
-        uuid.time_hi_and_version = simple_strtoul(in+14, NULL, 16);
-        uuid.clock_seq = simple_strtoul(in+19, NULL, 16);
-        cp = in+24;
-        buf[2] = 0;
-        for (i=0; i < 6; i++) {
-                buf[0] = *cp++;
-                buf[1] = *cp++;
-                uuid.node[i] = simple_strtoul(buf, NULL, 16);
-        }
+	LASSERT(nr * sizeof *uu == sizeof(class_uuid_t));
 
-        uuid_pack(&uuid, uu);
-        return 0;
+	while (nr-- > 0)
+		CONSUME(uu[nr], &ptr);
 }
-#endif
-
-
-void generate_random_uuid(unsigned char uuid_out[16]);
 
 void class_uuid_unparse(class_uuid_t uu, struct obd_uuid *out)
 {
-        struct uuid uuid;
+	/* uu as an array of __u16's */
+        __u16 uuid[sizeof(class_uuid_t) / sizeof(__u16)];
+
+	CLASSERT(ARRAY_SIZE(uuid) == 8);
 
-        uuid_unpack(uu, &uuid);
-        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]);
+        uuid_unpack(uu, uuid, ARRAY_SIZE(uuid));
+        sprintf(out->uuid, "%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
+		uuid[0], uuid[1], uuid[2], uuid[3],
+		uuid[4], uuid[5], uuid[6], uuid[7]);
 }