Changeset 80c760e in mainline for uspace/srv/bd/hr/raid5.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/raid5.c (modified) (2 diffs)

uspace/srv/bd/hr/raid5.c

@@ -131 +131 @@
         assert(vol->level == HR_LVL_5 || vol->level == HR_LVL_4);
 
-        uint64_t truncated_blkno = vol->extents[0].blkno;
-        for (size_t i = 1; i < vol->extent_no; i++) {
-                if (vol->extents[i].blkno < truncated_blkno)
-                        truncated_blkno = vol->extents[i].blkno;
-        }
-
-        uint64_t total_blkno = truncated_blkno * vol->extent_no;
-
-        vol->truncated_blkno = truncated_blkno;
+        uint64_t total_blkno = vol->truncated_blkno * vol->extent_no;
+
         vol->data_offset = vol->meta_ops->get_data_offset();
 
@@ -145 +138 @@
         /* count md blocks */
         vol->data_blkno -= vol->meta_ops->get_size() * vol->extent_no;
-        vol->data_blkno -= truncated_blkno; /* count parity */
+        vol->data_blkno -= vol->truncated_blkno; /* count parity */
 
         vol->strip_size = HR_STRIP_SIZE;