Centralise code for copying uuid

Rather than opencoding the byteswap all the time.

diff --git a/bitmap.c b/bitmap.c
index c905b4d3f548bd9fc72b4d8c84f8d8beb6711563..dcea26337dccaaaf9e27f5b2e0583245bd4e1e19 100644 (file)
--- a/bitmap.c
+++ b/bitmap.c
@@ -420,18 +420,7 @@ int bitmap_update_uuid(int fd, int *uuid, int swap)
                return 1;
        if (bm.magic != __cpu_to_le32(BITMAP_MAGIC))
                return 1;
-       if (swap) {
-               unsigned char *ac = (unsigned char *)bm.uuid;
-               unsigned char *bc = (unsigned char *)uuid;
-               int i;
-               for (i=0; i<16; i+= 4) {
-                       ac[i+0] = bc[i+3];
-                       ac[i+1] = bc[i+2];
-                       ac[i+2] = bc[i+1];
-                       ac[i+3] = bc[i+0];
-               }
-       } else
-               memcpy(bm.uuid, uuid, 16);
+       copy_uuid(bm.uuid, uuid, swap);
        if (lseek(fd, 0, 0) != 0)
                return 2;
        if (write(fd, &bm, sizeof(bm)) != sizeof(bm)) {

diff --git a/mdadm.h b/mdadm.h
index b4bf343524ef65cfc1b676e8ebdc74ddd2212a64..d40d18735d906e962814357c5c9ea7e897e24a95 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -460,6 +460,7 @@ extern void free_line(char *line);
 extern int match_oneof(char *devices, char *devname);
 extern void uuid_from_super(int uuid[4], mdp_super_t *super);
 extern int same_uuid(int a[4], int b[4], int swapuuid);
+extern void copy_uuid(void *a, int b[4], int swapuuid);
 /* extern int compare_super(mdp_super_t *first, mdp_super_t *second);*/
 extern unsigned long calc_csum(void *super, int bytes);
 extern int enough(int level, int raid_disks, int layout, int clean,

diff --git a/super1.c b/super1.c
index eb6499e912e400980115b29d615abc01123d37d6..a480f21cf3386fbdfdd059238b37804f64147b70 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -538,18 +538,7 @@ static int update_super1(struct mdinfo *info, void *sbv, char *update,
                sb->resync_offset = 0ULL;
        }
        if (strcmp(update, "uuid") == 0) {
-               if (super1.swapuuid) {
-                       unsigned char *ac = (unsigned char *)sb->set_uuid;
-                       unsigned char *bc = (unsigned char *)info->uuid;
-                       int i;
-                       for (i=0; i<16; i+= 4) {
-                               ac[i+0] = bc[i+3];
-                               ac[i+1] = bc[i+2];
-                               ac[i+2] = bc[i+1];
-                               ac[i+3] = bc[i+0];
-                       }
-               } else
-                       memcpy(sb->set_uuid, info->uuid, 16);
+               copy_uuid(sb->set_uuid, info->uuid, super1.swapuuid);
 
                if (__le32_to_cpu(sb->feature_map)&MD_FEATURE_BITMAP_OFFSET) {
                        struct bitmap_super_s *bm;
@@ -627,20 +616,9 @@ static int init_super1(struct supertype *st, void **sbp, mdu_array_info_t *info,
        sb->feature_map = 0;
        sb->pad0 = 0;
 
-       if (uuid) {
-               if (super1.swapuuid) {
-                       unsigned char *ac = (unsigned char *)sb->set_uuid;
-                       unsigned char *bc = (unsigned char *)uuid;
-                       int i;
-                       for (i=0; i<16; i+= 4) {
-                               ac[i+0] = bc[i+3];
-                               ac[i+1] = bc[i+2];
-                               ac[i+2] = bc[i+1];
-                               ac[i+3] = bc[i+0];
-                       }
-               } else
-                       memcpy(sb->set_uuid, uuid, 16);
-       } else {
+       if (uuid)
+               copy_uuid(sb->set_uuid, uuid, super1.swapuuid);
+       else {
                if ((rfd = open("/dev/urandom", O_RDONLY)) < 0 ||
                    read(rfd, sb->set_uuid, 16) != 16) {
                        *(__u32*)(sb->set_uuid) = random();

diff --git a/util.c b/util.c
index ffb113c3c9d5179a872e0e55ed39b7f8f7ef0043..c21bf5143dfd43129cadb04f9816288f83a5ef0e 100644 (file)
--- a/util.c
+++ b/util.c
@@ -246,6 +246,25 @@ int same_uuid(int a[4], int b[4], int swapuuid)
                return 0;
        }
 }
+void copy_uuid(void *a, int b[4], int swapuuid)
+{
+       if (swapuuid) {
+               /* parse uuids are hostendian.
+                * uuid's from some superblocks are big-ending
+                * if there is a difference, we need to swap..
+                */
+               unsigned char *ac = (unsigned char *)a;
+               unsigned char *bc = (unsigned char *)b;
+               int i;
+               for (i=0; i<16; i+= 4) {
+                       ac[i+0] = bc[i+3];
+                       ac[i+1] = bc[i+2];
+                       ac[i+2] = bc[i+1];
+                       ac[i+3] = bc[i+0];
+               }
+       } else
+               memcpy(a, b, 16);
+}
 
 #ifndef MDASSEMBLE
 int check_ext2(int fd, char *name)