Changeset 65706f1 in mainline for uspace/srv/bd/hr/superblock.c

Timestamp:

2024-11-27T14:06:41Z (7 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

a0c3080

Parents:

40bf2c6

Message:

hr: rename dev_no → extent_no in hr_volume_t

File:

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

uspace/srv/bd/hr/superblock.c

@@ -70 +70 @@
                 goto error;
 
-        for (i = 0; i < vol->dev_no; i++) {
+        for (i = 0; i < vol->extent_no; i++) {
                 metadata->index = host2uint32_t_le(i);
 
@@ -138 +138 @@
         meta_blkno = (HR_META_OFF + HR_META_SIZE);
         if (vol->level != HR_LVL_1)
-                meta_blkno *= vol->dev_no;
+                meta_blkno *= vol->extent_no;
 
         if (vol->nblocks < meta_blkno) {
@@ -153 +153 @@
 
         metadata->magic = host2uint64_t_le(HR_MAGIC);
-        metadata->extent_no = host2uint32_t_le(vol->dev_no);
+        metadata->extent_no = host2uint32_t_le(vol->extent_no);
         metadata->level = host2uint32_t_le(vol->level);
         metadata->nblocks = host2uint64_t_le(vol->nblocks);
@@ -186 +186 @@
 
         service_id_t cfg_svc_id_order[HR_MAX_EXTENTS] = { 0 };
-        for (size_t i = 0; i < vol->dev_no; i++)
+        for (size_t i = 0; i < vol->extent_no; i++)
                 cfg_svc_id_order[i] = vol->extents[i].svc_id;
 
         int32_t md_order[HR_MAX_EXTENTS] = { 0 };
-        for (size_t i = 0; i < vol->dev_no; i++) {
+        for (size_t i = 0; i < vol->extent_no; i++) {
                 if (cfg_svc_id_order[i] == 0) {
                         md_order[i] = -1;
@@ -204 +204 @@
         }
 
-        for (size_t i = 0; i < vol->dev_no; i++) {
+        for (size_t i = 0; i < vol->extent_no; i++) {
                 vol->extents[i].svc_id = 0;
                 vol->extents[i].status = HR_EXT_MISSING;
@@ -210 +210 @@
 
         /* sort */
-        for (size_t i = 0; i < vol->dev_no; i++) {
-                for (size_t j = 0; j < vol->dev_no; j++) {
+        for (size_t i = 0; i < vol->extent_no; i++) {
+                for (size_t j = 0; j < vol->extent_no; j++) {
                         if (i == (uint32_t)md_order[j]) {
                                 vol->extents[i].svc_id = cfg_svc_id_order[j];
@@ -223 +223 @@
          */
 
-        if (vol->dev_no != uint32_t_le2host(metadata->extent_no)) {
+        if (vol->extent_no != uint32_t_le2host(metadata->extent_no)) {
                 HR_ERROR("number of divices in array differ: specified %zu, "
                     "metadata states %u",
-                    vol->dev_no, uint32_t_le2host(metadata->extent_no));
+                    vol->extent_no, uint32_t_le2host(metadata->extent_no));
                 rc = EINVAL;
                 goto end;