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

Timestamp:

2024-11-15T16:44:25Z (6 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

b235c67

Parents:

5d96f427

git-author:

Miroslav Cimerman <mc@…> (2024-11-15 16:27:17)

git-committer:

Miroslav Cimerman <mc@…> (2024-11-15 16:44:25)

Message:

hr: add all fcn prototypes in raid implementations

Also restructure the file in order: create(), init(),
public BD ops, internal util functions and io ops.

File:

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

uspace/srv/bd/hr/raid1.c

@@ -53 +53 @@
 extern loc_srv_t *hr_srv;
 
+static errno_t hr_raid1_check_vol_status(hr_volume_t *);
+static errno_t hr_raid1_update_vol_status(hr_volume_t *);
+static void handle_extent_error(hr_volume_t *, size_t, errno_t);
+static errno_t hr_raid1_bd_op(hr_bd_op_type_t, bd_srv_t *, aoff64_t, size_t,
+    void *, const void *, size_t);
+
+/* bdops */
 static errno_t hr_raid1_bd_open(bd_srvs_t *, bd_srv_t *);
 static errno_t hr_raid1_bd_close(bd_srv_t *);
@@ -73 +80 @@
 };
 
+errno_t hr_raid1_create(hr_volume_t *new_volume)
+{
+        errno_t rc;
+
+        assert(new_volume->level == HR_LVL_1);
+
+        if (new_volume->dev_no < 2) {
+                ERR_PRINTF("RAID 1 array needs at least 2 devices\n");
+                return EINVAL;
+        }
+
+        rc = hr_raid1_update_vol_status(new_volume);
+        if (rc != EOK)
+                return rc;
+
+        bd_srvs_init(&new_volume->hr_bds);
+        new_volume->hr_bds.ops = &hr_raid1_bd_ops;
+        new_volume->hr_bds.sarg = new_volume;
+
+        rc = hr_register_volume(new_volume);
+
+        return rc;
+}
+
+errno_t hr_raid1_init(hr_volume_t *vol)
+{
+        errno_t rc;
+        size_t bsize;
+        uint64_t total_blkno;
+
+        assert(vol->level == HR_LVL_1);
+
+        rc = hr_check_devs(vol, &total_blkno, &bsize);
+        if (rc != EOK)
+                return rc;
+
+        vol->nblocks = total_blkno / vol->dev_no;
+        vol->bsize = bsize;
+        vol->data_offset = HR_DATA_OFF;
+        vol->data_blkno = vol->nblocks - vol->data_offset;
+        vol->strip_size = 0;
+
+        return EOK;
+}
+
+static errno_t hr_raid1_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+{
+        DPRINTF("hr_bd_open()\n");
+        return EOK;
+}
+
+static errno_t hr_raid1_bd_close(bd_srv_t *bd)
+{
+        DPRINTF("hr_bd_close()\n");
+        return EOK;
+}
+
+static errno_t hr_raid1_bd_sync_cache(bd_srv_t *bd, aoff64_t ba, size_t cnt)
+{
+        return hr_raid1_bd_op(HR_BD_SYNC, bd, ba, cnt, NULL, NULL, 0);
+}
+
+static errno_t hr_raid1_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
+    void *buf, size_t size)
+{
+        return hr_raid1_bd_op(HR_BD_READ, bd, ba, cnt, buf, NULL, size);
+}
+
+static errno_t hr_raid1_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
+    const void *data, size_t size)
+{
+        return hr_raid1_bd_op(HR_BD_WRITE, bd, ba, cnt, NULL, data, size);
+}
+
+static errno_t hr_raid1_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
+{
+        hr_volume_t *vol = bd->srvs->sarg;
+
+        *rsize = vol->bsize;
+        return EOK;
+}
+
+static errno_t hr_raid1_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
+{
+        hr_volume_t *vol = bd->srvs->sarg;
+
+        *rnb = vol->data_blkno;
+        return EOK;
+}
+
 static errno_t hr_raid1_check_vol_status(hr_volume_t *vol)
 {
@@ -118 +215 @@
                 return EOK;
         }
-}
-
-static errno_t hr_raid1_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
-{
-        DPRINTF("hr_bd_open()\n");
-        return EOK;
-}
-
-static errno_t hr_raid1_bd_close(bd_srv_t *bd)
-{
-        DPRINTF("hr_bd_close()\n");
-        return EOK;
 }
 
@@ -217 +302 @@
 }
 
-static errno_t hr_raid1_bd_sync_cache(bd_srv_t *bd, aoff64_t ba, size_t cnt)
-{
-        return hr_raid1_bd_op(HR_BD_SYNC, bd, ba, cnt, NULL, NULL, 0);
-}
-
-static errno_t hr_raid1_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
-    void *buf, size_t size)
-{
-        return hr_raid1_bd_op(HR_BD_READ, bd, ba, cnt, buf, NULL, size);
-}
-
-static errno_t hr_raid1_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
-    const void *data, size_t size)
-{
-        return hr_raid1_bd_op(HR_BD_WRITE, bd, ba, cnt, NULL, data, size);
-}
-
-static errno_t hr_raid1_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
-{
-        hr_volume_t *vol = bd->srvs->sarg;
-
-        *rsize = vol->bsize;
-        return EOK;
-}
-
-static errno_t hr_raid1_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
-{
-        hr_volume_t *vol = bd->srvs->sarg;
-
-        *rnb = vol->data_blkno;
-        return EOK;
-}
-
-errno_t hr_raid1_create(hr_volume_t *new_volume)
-{
-        errno_t rc;
-
-        assert(new_volume->level == HR_LVL_1);
-
-        if (new_volume->dev_no < 2) {
-                ERR_PRINTF("RAID 1 array needs at least 2 devices\n");
-                return EINVAL;
-        }
-
-        rc = hr_raid1_update_vol_status(new_volume);
-        if (rc != EOK)
-                return rc;
-
-        bd_srvs_init(&new_volume->hr_bds);
-        new_volume->hr_bds.ops = &hr_raid1_bd_ops;
-        new_volume->hr_bds.sarg = new_volume;
-
-        rc = hr_register_volume(new_volume);
-
-        return rc;
-}
-
-errno_t hr_raid1_init(hr_volume_t *vol)
-{
-        errno_t rc;
-        size_t bsize;
-        uint64_t total_blkno;
-
-        assert(vol->level == HR_LVL_1);
-
-        rc = hr_check_devs(vol, &total_blkno, &bsize);
-        if (rc != EOK)
-                return rc;
-
-        vol->nblocks = total_blkno / vol->dev_no;
-        vol->bsize = bsize;
-        vol->data_offset = HR_DATA_OFF;
-        vol->data_blkno = vol->nblocks - vol->data_offset;
-        vol->strip_size = 0;
-
-        return EOK;
-}
-
 /** @}
  */