Changeset 6b8e89b0 in mainline for uspace/srv/bd/hr/superblock.c

Timestamp:

2024-10-05T13:11:11Z (8 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

dceb6e7

Parents:

dbd91da

git-author:

Miroslav Cimerman <mc@…> (2024-10-05 12:39:13)

git-committer:

Miroslav Cimerman <mc@…> (2024-10-05 13:11:11)

Message:

hr: init fuction for each RAID level

Compute total blocks, data blocks and set block size, data offset, strip
size there.

File:

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

uspace/srv/bd/hr/superblock.c

@@ -57 +57 @@
 
         errno_t rc;
-        size_t i, data_offset;
-        uint64_t data_blkno;
+        size_t i;
+        size_t meta_blkno; /* blocks needed to write metadata */
         hr_metadata_t *metadata;
         uuid_t uuid;
@@ -66 +66 @@
                 return ENOMEM;
 
-        if (vol->nblocks <= HR_META_OFF + HR_META_SIZE) {
+        meta_blkno = (HR_META_OFF + HR_META_SIZE);
+        if (vol->level != hr_l_1)
+                meta_blkno *= vol->dev_no;
+
+        if (vol->nblocks < meta_blkno) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "not enough blocks");
+                    "not enough blocks to write metadata");
                 rc = EINVAL;
                 goto error;
-        }
-
-        data_offset = HR_META_OFF + HR_META_SIZE;
-        if (vol->level == hr_l_1) {
-                data_blkno = vol->nblocks - data_offset;
-        } else if (vol->level == hr_l_0) {
-                data_blkno = vol->nblocks - (data_offset * vol->dev_no);
-        } else if (vol->level == hr_l_4) {
-                data_blkno = vol->nblocks - (data_offset * vol->dev_no) - (vol->nblocks / vol->dev_no);
-        } else {
+        } else if (vol->nblocks == meta_blkno) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "level %d not implemented yet", vol->level);
-                return EINVAL;
+                    "there would be zero data blocks after writing metadata, aborting");
+                rc = EINVAL;
+                goto error;
         }
 
@@ -90 +86 @@
         metadata->level = host2uint32_t_le(vol->level);
         metadata->nblocks = host2uint64_t_le(vol->nblocks);
-        metadata->data_blkno = host2uint64_t_le(data_blkno);
-        metadata->data_offset = host2uint32_t_le(data_offset);
+        metadata->data_blkno = host2uint64_t_le(vol->data_blkno);
+        metadata->data_offset = host2uint32_t_le(vol->data_offset);
         metadata->strip_size = host2uint32_t_le(vol->strip_size);
         for (i = 0; i < vol->dev_no; i++) {
@@ -103 +99 @@
                 str_cpy(metadata->devname, 32, vol->devname);
 
-                rc = block_write_direct(vol->extents[i].svc_id, HR_META_OFF, HR_META_SIZE,
-                    metadata);
+                rc = block_write_direct(vol->extents[i].svc_id, HR_META_OFF,
+                    HR_META_SIZE, metadata);
                 if (rc != EOK)
                         goto error;
         }
-
-        /* fill in new members */
-        vol->data_offset = data_offset;
-        vol->data_blkno = data_blkno;
-
 error:
         free(metadata);