Changeset b0f1366 in mainline for uspace/srv/bd/hr/raid1.c

Timestamp:

2024-09-06T11:37:54Z (16 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

9c1cf34c

Parents:

ee83e9c

Message:

hr: write persistent metadata, assemble array from metadata

File:

• uspace/srv/bd/hr/raid1.c (modified) (8 diffs)

uspace/srv/bd/hr/raid1.c

@@ -47 +47 @@
 #include <str_error.h>
 
+#include "util.h"
 #include "var.h"
-#include "util.h"
 
 extern fibril_mutex_t big_lock;
@@ -85 +85 @@
 }
 
-static errno_t hr_raid1_bd_sync_cache(bd_srv_t *bd, aoff64_t ba, size_t size)
+static errno_t hr_raid1_bd_sync_cache(bd_srv_t *bd, aoff64_t ba, size_t cnt)
 {
         fibril_mutex_lock(&big_lock);
@@ -93 +93 @@
         size_t i;
 
+        rc = hr_calc_ba(vol, cnt, &ba);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&big_lock);
+                return rc;
+        }
+
         for (i = 0; i < vol->dev_no; i++) {
-                rc = block_sync_cache(vol->devs[i], ba, size);
+                rc = block_sync_cache(vol->devs[i], ba, cnt);
                 if (rc != EOK)
                         break;
@@ -111 +117 @@
         errno_t rc;
         size_t i;
+
+        rc = hr_calc_ba(vol, cnt, &ba);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&big_lock);
+                return rc;
+        }
 
         for (i = 0; i < vol->dev_no; i++) {
@@ -131 +143 @@
         size_t i;
 
+        rc = hr_calc_ba(vol, cnt, &ba);
+        if (rc != EOK) {
+                fibril_mutex_unlock(&big_lock);
+                return rc;
+        }
+
         for (i = 0; i < vol->dev_no; i++) {
                 rc = block_write_direct(vol->devs[i], ba, cnt, data);
@@ -153 +171 @@
         hr_volume_t *vol = bd->srvs->sarg;
 
-        *rnb = vol->nblocks;
+        *rnb = vol->data_blkno;
         return EOK;
 }
@@ -159 +177 @@
 errno_t hr_raid1_create(hr_volume_t *new_volume)
 {
+        errno_t rc;
+
         assert(new_volume->level == hr_l_1);
 
@@ -167 +187 @@
         }
 
-        errno_t rc;
-        size_t i, bsize, last_bsize;
-        uint64_t nblocks, last_nblocks;
-        uint64_t total_blocks = 0;
-
-        rc = hr_init_devs(new_volume);
-        if (rc != EOK)
-                return rc;
-
-        for (i = 0; i < new_volume->dev_no; i++) {
-                rc = block_get_nblocks(new_volume->devs[i], &nblocks);
-                if (rc != EOK)
-                        goto error;
-                if (i != 0 && nblocks != last_nblocks) {
-                        log_msg(LOG_DEFAULT, LVL_ERROR,
-                            "number of blocks differs");
-                        rc = EINVAL;
-                        goto error;
-                }
-                total_blocks += nblocks;
-                last_nblocks = nblocks;
-        }
-
-        for (i = 0; i < new_volume->dev_no; i++) {
-                rc = block_get_bsize(new_volume->devs[i], &bsize);
-                if (rc != EOK)
-                        goto error;
-                if (i != 0 && bsize != last_bsize) {
-                        log_msg(LOG_DEFAULT, LVL_ERROR, "block sizes differ");
-                        rc = EINVAL;
-                        goto error;
-                }
-                last_bsize = bsize;
-        }
-
         bd_srvs_init(&new_volume->hr_bds);
         new_volume->hr_bds.ops = &hr_raid1_bd_ops;
         new_volume->hr_bds.sarg = new_volume;
-        new_volume->nblocks = total_blocks / new_volume->dev_no;
-        new_volume->bsize = bsize;
 
         rc = hr_register_volume(new_volume);
         if (rc != EOK)
-                goto error;
-
-        return EOK;
-error:
-        hr_fini_devs(new_volume);
-        return rc;
+                return rc;
+
+        return EOK;
 }