Changeset 059885c in mainline

Timestamp:

2025-06-30T10:55:31Z (4 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

d04a350

Parents:

95ca19d

Message:

hr: metadata/softraid: fix and allow rebuild

Location:

uspace/srv/bd/hr/metadata/foreign/softraid

Files:

• hr_softraid.c (modified) (5 diffs)
• softraid.c (modified) (1 diff)

uspace/srv/bd/hr/metadata/foreign/softraid/hr_softraid.c

@@ -182 +182 @@
         memcpy(vol->in_mem_md, main_meta, SR_META_SIZE * DEV_BSIZE);
 
-        bool rebuild = false;
+        bool rebuild_set = false;
         list_foreach(*list, link, struct dev_list_member, iter) {
                 struct sr_metadata *iter_meta = iter->md;
@@ -195 +195 @@
 
                 bool invalidate = false;
+                bool rebuild_this_ext = false;
 
                 if (iter_meta->ssd_meta_flags & SR_META_DIRTY)
@@ -202 +203 @@
 
                 if (mc->scm_status == BIOC_SDREBUILD && !invalidate) {
-                        if (rebuild) {
+                        if (rebuild_set) {
                                 HR_DEBUG("only 1 rebuilt extent allowed");
                                 rc = EINVAL;
                                 goto error;
                         }
-                        rebuild = true;
+                        rebuild_set = true;
+                        rebuild_this_ext = true;
                         vol->rebuild_blk = iter_meta->ssd_rebuild;
                 }
 
-                if (!rebuild && !invalidate)
+                if (!rebuild_this_ext && !invalidate)
                         vol->extents[index].state = HR_EXT_ONLINE;
-                else if (rebuild && !invalidate)
+                else if (rebuild_this_ext && !invalidate)
                         vol->extents[index].state = HR_EXT_REBUILD;
                 else
@@ -297 +299 @@
         fibril_mutex_lock(&vol->md_lock);
 
-        if (s == HR_EXT_REBUILD) {
-                md->ssd_rebuild = vol->rebuild_blk;
+        md->ssd_rebuild = vol->rebuild_blk;
+        md->ssdi.ssd_chunk_id = ext_idx;
+
+        if (s == HR_EXT_REBUILD)
                 mc->scm_status = BIOC_SDREBUILD;
-        } else {
-                md->ssd_rebuild = 0;
+        else
                 mc->scm_status = BIOC_SDONLINE;
-        }
 
         meta_softraid_encode(md, md_block);
@@ -355 +357 @@
 {
         uint8_t flags = 0;
+
+        flags |= HR_METADATA_ALLOW_REBUILD;
 
         return flags;

uspace/srv/bd/hr/metadata/foreign/softraid/softraid.c

@@ -97 +97 @@
         printf("\tssd_meta_flags 0x%" PRIx32 "\n", m->ssd_meta_flags);
         printf("\tssd_ondisk %" PRId64 "\n", m->ssd_ondisk);
+        printf("\tssd_rebuild %" PRId64 "\n", m->ssd_rebuild);
 
         mc = (struct sr_meta_chunk *)(m + 1);