Changeset b127da2f in mainline

Timestamp:

2025-07-11T19:48:47Z (2 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

ca212a51

Parents:

9c3369b

Message:

hr: careful assembly

Location:

uspace/srv/bd/hr

Files:

• metadata/foreign/geom/hr_g_mirror.c (modified) (1 diff)
• metadata/foreign/geom/hr_g_stripe.c (modified) (1 diff)
• metadata/foreign/md/hr_md.c (modified) (1 diff)
• metadata/foreign/softraid/hr_softraid.c (modified) (1 diff)
• metadata/native.c (modified) (1 diff)
• util.c (modified) (6 diffs)

uspace/srv/bd/hr/metadata/foreign/geom/hr_g_mirror.c

@@ -189 +189 @@
 
                 vol->extents[index].svc_id = iter->svc_id;
-                iter->fini = false;
 
                 bool invalidate = false;

uspace/srv/bd/hr/metadata/foreign/geom/hr_g_stripe.c

@@ -189 +189 @@
 
                 vol->extents[index].svc_id = iter->svc_id;
-                iter->fini = false;
 
                 vol->extents[index].state = HR_EXT_ONLINE;

uspace/srv/bd/hr/metadata/foreign/md/hr_md.c

@@ -206 +206 @@
 
                 vol->extents[index].svc_id = iter->svc_id;
-                iter->fini = false;
 
                 bool invalidate = false;

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

@@ -189 +189 @@
 
                 vol->extents[index].svc_id = iter->svc_id;
-                iter->fini = false;
 
                 struct sr_meta_chunk *mc =

uspace/srv/bd/hr/metadata/native.c

@@ -204 +204 @@
 
                 vol->extents[iter_meta->index].svc_id = iter->svc_id;
-                iter->fini = false;
 
                 hr_ext_state_t final_ext_state = HR_EXT_INVALID;

uspace/srv/bd/hr/util.c

@@ -621 +621 @@
         to_add->svc_id = svc_id;
         to_add->inited = inited;
+        to_add->fini = true;
 
         if (md != NULL) {
@@ -858 +859 @@
                 goto error;
 
+        for (size_t e = 0; e < vol->extent_no; e++) {
+                if (vol->extents[e].svc_id == 0)
+                        continue;
+                list_foreach(*list, link, struct dev_list_member, iter) {
+                        if (iter->svc_id == vol->extents[e].svc_id)
+                                iter->fini = false;
+                }
+        }
+
         rc = hr_register_volume(vol);
         if (rc != EOK)
@@ -870 +880 @@
         return EOK;
 error:
+        /* let the caller fini the block svc list */
+        for (size_t e = 0; e < vol->extent_no; e++)
+                vol->extents[e].svc_id = 0;
+
         hr_destroy_vol_struct(vol);
+
         return rc;
 }
@@ -945 +960 @@
                 }
 
-                if (rc != EOK)
-                        goto error;
+                if (rc != EOK) {
+                        block_fini(iter->svc_id);
+                        free_dev_list_member(iter);
+                        goto error;
+                }
 
                 char *svc_name = NULL;
                 rc = loc_service_get_name(iter->svc_id, &svc_name);
-                if (rc != EOK)
-                        goto error;
+                if (rc != EOK) {
+                        block_fini(iter->svc_id);
+                        free_dev_list_member(iter);
+                        goto error;
+                }
                 HR_DEBUG("found valid metadata on %s (type = %s), matching "
                     "other extents\n",
@@ -962 +983 @@
                 rc = hr_util_get_matching_md_svcs_list(&matching_svcs_list,
                     &dev_id_list, iter->svc_id, type, metadata_struct_main);
-                if (rc != EOK)
-                        goto error;
+                if (rc != EOK) {
+                        block_fini(iter->svc_id);
+                        free_dev_list_member(iter);
+                        goto error;
+                }
 
                 /* add current iter to list as well */
@@ -969 +993 @@
                     iter->svc_id, true, metadata_struct_main);
                 if (rc != EOK) {
+                        block_fini(iter->svc_id);
                         free_svc_id_list(&matching_svcs_list);
                         goto error;
                 }
+
+                free_dev_list_member(iter);
 
                 /* remove matching list members from dev_id_list */