Changeset 685c0ab in mainline

Timestamp:

2024-12-30T22:28:13Z (6 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

7d25273

Parents:

7a3529a8

Message:

hr: superblock.c: style

File:

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

uspace/srv/bd/hr/superblock.c

@@ -52 +52 @@
 static errno_t read_metadata(service_id_t, hr_metadata_t *);
 static errno_t hr_fill_meta_from_vol(hr_volume_t *, hr_metadata_t *);
+static errno_t validate_meta(hr_metadata_t *);
 
 errno_t hr_write_meta_to_vol(hr_volume_t *vol)
@@ -134 +135 @@
         HR_DEBUG("hr_fill_meta_from_vol()\n");
 
-        size_t meta_blkno; /* blocks needed to write metadata */
-
-        meta_blkno = (HR_META_OFF + HR_META_SIZE);
+        size_t meta_blkno = HR_META_OFF + HR_META_SIZE;
+
         if (vol->level != HR_LVL_1)
                 meta_blkno *= vol->extent_no;
@@ -189 +189 @@
                 return ENOMEM;
 
-        service_id_t cfg_svc_id_order[HR_MAX_EXTENTS] = { 0 };
+        service_id_t assembly_svc_id_order[HR_MAX_EXTENTS] = { 0 };
         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 };
+                assembly_svc_id_order[i] = vol->extents[i].svc_id;
+
+        size_t md_order_indices[HR_MAX_EXTENTS] = { 0 };
         for (size_t i = 0; i < vol->extent_no; i++) {
-                if (cfg_svc_id_order[i] == 0) {
-                        md_order[i] = -1;
+                if (assembly_svc_id_order[i] == 0) {
+                        /* set invalid index */
+                        md_order_indices[i] = vol->extent_no;
                         continue;
                 }
-                rc = read_metadata(cfg_svc_id_order[i], metadata);
+                rc = read_metadata(assembly_svc_id_order[i], metadata);
                 if (rc != EOK)
                         goto end;
@@ -205 +206 @@
                 if (rc != EOK)
                         goto end;
-                md_order[i] = uint32_t_le2host(metadata->index);
+                md_order_indices[i] = uint32_t_le2host(metadata->index);
         }
 
@@ -216 +217 @@
         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];
+                        if (i == md_order_indices[j]) {
+                                vol->extents[i].svc_id =
+                                    assembly_svc_id_order[j];
                                 vol->extents[i].status = HR_EXT_ONLINE;
                         }
@@ -256 +258 @@
 {
         errno_t rc;
-        size_t bsize;
         uint64_t nblocks;
 
-        rc = block_get_bsize(dev, &bsize);
+        rc = block_get_nblocks(dev, &nblocks);
         if (rc != EOK)
                 return rc;
 
-        rc = block_get_nblocks(dev, &nblocks);
+        if (nblocks < HR_META_SIZE + HR_META_OFF)
+                return EINVAL;
+
+        rc = block_read_direct(dev, HR_META_OFF, HR_META_SIZE, metadata);
         if (rc != EOK)
                 return rc;
 
-        if (nblocks < (HR_META_SIZE + HR_META_OFF) * bsize)
-                return EINVAL;
-
-        rc = block_read_direct(dev, HR_META_OFF, HR_META_SIZE, metadata);
-        if (rc != EOK)
-                return rc;
-
         return EOK;
 }