Changeset b422718 in mainline

Timestamp:

2024-10-28T17:44:11Z (7 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

066fed9

Parents:

4dd650a

git-author:

Miroslav Cimerman <mc@…> (2024-10-28 17:42:31)

git-committer:

Miroslav Cimerman <mc@…> (2024-10-28 17:44:11)

Message:

hr: sort extents based on metadata index

File:

• uspace/srv/bd/hr/superblock.c (modified) (2 diffs)

uspace/srv/bd/hr/superblock.c

@@ -112 +112 @@
 }
 
+static errno_t validate_meta(hr_metadata_t *md)
+{
+        if (uint64_t_le2host(md->magic) != HR_MAGIC) {
+                printf("invalid magic\n");
+                return EINVAL;
+        }
+        return EOK;
+}
+
+
 errno_t hr_get_vol_from_meta(hr_config_t *cfg, hr_volume_t *new_volume)
 {
@@ -123 +133 @@
                 return ENOMEM;
 
-        /* for now assume metadata are in sync across extents */
-        rc = read_metadata(cfg->devs[0], metadata);
-        if (rc != EOK)
-                goto end;
-
-        /* TODO: sort new_volume->extents according to metadata extent index */
-
-        if (uint64_t_le2host(metadata->magic) != HR_MAGIC) {
-                printf("invalid magic\n");
-                rc = EINVAL;
-                goto end;
-        }
+        uint32_t md_order[HR_MAXDEVS] = { 0 };
+        for (size_t i = 0; i < cfg->dev_no; i++) {
+                rc = read_metadata(cfg->devs[i], metadata);
+                if (rc != EOK)
+                        goto end;
+                rc = validate_meta(metadata);
+                if (rc != EOK)
+                        goto end;
+                md_order[i] = uint32_t_le2host(metadata->index);
+        }
+
+        for (size_t i = 0; i < cfg->dev_no; i++)
+                for (size_t j = 0; j < cfg->dev_no; j++)
+                        if (i == md_order[j])
+                                new_volume->extents[i].svc_id = cfg->devs[j];
+
+        /*
+         * still assume metadata are in sync across extents
+         */
 
         new_volume->level = uint32_t_le2host(metadata->level);