Changeset 80c760e in mainline for uspace/srv/bd/hr/util.c

Timestamp:

2025-04-21T12:34:02Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

75262d2f

Parents:

18c3658

Message:

hr: remove truncated_blkno calculation from raid*.c

Calculate the initial truncated_blkno in hr_init_extents_from_cfg,
allowing the removal of hr_extent_t.blkno.

Also fixes double block_fini() on failed volume creation in
hr_util_try_assemble().

File:

• uspace/srv/bd/hr/util.c (modified) (6 diffs)

uspace/srv/bd/hr/util.c

@@ -234 +234 @@
 
         errno_t rc;
-        uint64_t blkno;
+        uint64_t blkno, smallest_blkno = ~0ULL;
         size_t i, bsize;
         size_t last_bsize = 0;
@@ -269 +269 @@
 
                 vol->extents[i].svc_id = svc_id;
-                vol->extents[i].blkno = blkno;
                 vol->extents[i].status = HR_EXT_ONLINE;
 
+                if (blkno < smallest_blkno)
+                        smallest_blkno = blkno;
                 last_bsize = bsize;
         }
@@ -277 +278 @@
         vol->bsize = last_bsize;
         vol->extent_no = cfg->dev_no;
+        vol->truncated_blkno = smallest_blkno;
 
         for (i = 0; i < HR_MAX_HOTSPARES; i++)
@@ -728 +730 @@
 
                 iter->inited = true;
+                iter->fini = true;
         }
 
@@ -738 +741 @@
 
         list_foreach(*list, link, struct dev_list_member, iter) {
-                if (iter->inited) {
+                if (iter->inited && iter->fini) {
                         block_fini(iter->svc_id);
                         iter->inited = false;
+                        iter->fini = false;
                 }
         }
@@ -983 +987 @@
                         asm_cnt++;
                         break;
-                case EEXIST:
-                        /*
-                         * A race is detected this way, because we don't want
-                         * to hold the hr_volumes list lock for a long time,
-                         * for all assembly attempts. XXX: discuss...
-                         */
+                case ENOMEM:
+                        goto error;
+                default:
                         rc = EOK;
-                        break;
-                default:
-                        block_fini_dev_list(&matching_svcs_list);
-                        free_svc_id_list(&matching_svcs_list);
-                        goto error;
-                }
-
+                }
+                block_fini_dev_list(&matching_svcs_list);
                 free_svc_id_list(&matching_svcs_list);
         }