Changeset da80de9 in mainline for uspace/srv/bd/hr/raid0.c

Timestamp:

2025-06-07T11:52:34Z (9 days ago)

Author:

Miroslav Cimerman <mc@…>

Children:

d482b05

Parents:

49da044

Message:

hr: move state callback to hr_ops_t

File:

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

uspace/srv/bd/hr/raid0.c

@@ -53 +53 @@
 #include "var.h"
 
-static void hr_raid0_update_vol_state(hr_volume_t *);
-static void hr_raid0_state_callback(hr_volume_t *, size_t, errno_t);
 static errno_t hr_raid0_bd_op(hr_bd_op_type_t, bd_srv_t *, aoff64_t, size_t,
     void *, const void *, size_t);
@@ -92 +90 @@
         }
 
-        hr_raid0_update_vol_state(new_volume);
+        hr_raid0_vol_state_eval(new_volume);
         if (new_volume->state != HR_VOL_ONLINE) {
                 HR_NOTE("\"%s\": unusable state, not creating\n",
@@ -103 +101 @@
         new_volume->hr_bds.sarg = new_volume;
 
-        new_volume->state_callback = hr_raid0_state_callback;
-
         return EOK;
 }
@@ -130 +126 @@
 }
 
-void hr_raid0_state_event(hr_volume_t *vol)
-{
-        HR_DEBUG("%s()", __func__);
-
-        hr_raid0_update_vol_state(vol);
-}
-
-static errno_t hr_raid0_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
-{
-        HR_DEBUG("%s()", __func__);
-
-        hr_volume_t *vol = bd->srvs->sarg;
-
-        atomic_fetch_add_explicit(&vol->open_cnt, 1, memory_order_relaxed);
-
-        return EOK;
-}
-
-static errno_t hr_raid0_bd_close(bd_srv_t *bd)
-{
-        HR_DEBUG("%s()", __func__);
-
-        hr_volume_t *vol = bd->srvs->sarg;
-
-        atomic_fetch_sub_explicit(&vol->open_cnt, 1, memory_order_relaxed);
-
-        return EOK;
-}
-
-static errno_t hr_raid0_bd_sync_cache(bd_srv_t *bd, aoff64_t ba, size_t cnt)
-{
-        return hr_raid0_bd_op(HR_BD_SYNC, bd, ba, cnt, NULL, NULL, 0);
-}
-
-static errno_t hr_raid0_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
-    void *buf, size_t size)
-{
-        return hr_raid0_bd_op(HR_BD_READ, bd, ba, cnt, buf, NULL, size);
-}
-
-static errno_t hr_raid0_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
-    const void *data, size_t size)
-{
-        return hr_raid0_bd_op(HR_BD_WRITE, bd, ba, cnt, NULL, data, size);
-}
-
-static errno_t hr_raid0_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_raid0_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 void hr_raid0_update_vol_state(hr_volume_t *vol)
-{
+void hr_raid0_vol_state_eval(hr_volume_t *vol)
+{
+        HR_DEBUG("%s()", __func__);
+
         fibril_mutex_lock(&vol->md_lock);
 
@@ -226 +162 @@
 }
 
-static void hr_raid0_state_callback(hr_volume_t *vol, size_t extent, errno_t rc)
-{
+void hr_raid0_ext_state_cb(hr_volume_t *vol, size_t extent, errno_t rc)
+{
+        HR_DEBUG("%s()", __func__);
+
         if (rc == EOK)
                 return;
@@ -246 +184 @@
 }
 
+static errno_t hr_raid0_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+{
+        HR_DEBUG("%s()", __func__);
+
+        hr_volume_t *vol = bd->srvs->sarg;
+
+        atomic_fetch_add_explicit(&vol->open_cnt, 1, memory_order_relaxed);
+
+        return EOK;
+}
+
+static errno_t hr_raid0_bd_close(bd_srv_t *bd)
+{
+        HR_DEBUG("%s()", __func__);
+
+        hr_volume_t *vol = bd->srvs->sarg;
+
+        atomic_fetch_sub_explicit(&vol->open_cnt, 1, memory_order_relaxed);
+
+        return EOK;
+}
+
+static errno_t hr_raid0_bd_sync_cache(bd_srv_t *bd, aoff64_t ba, size_t cnt)
+{
+        return hr_raid0_bd_op(HR_BD_SYNC, bd, ba, cnt, NULL, NULL, 0);
+}
+
+static errno_t hr_raid0_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
+    void *buf, size_t size)
+{
+        return hr_raid0_bd_op(HR_BD_READ, bd, ba, cnt, buf, NULL, size);
+}
+
+static errno_t hr_raid0_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
+    const void *data, size_t size)
+{
+        return hr_raid0_bd_op(HR_BD_WRITE, bd, ba, cnt, NULL, data, size);
+}
+
+static errno_t hr_raid0_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_raid0_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_raid0_bd_op(hr_bd_op_type_t type, bd_srv_t *bd, aoff64_t ba,
     size_t cnt, void *dst, const void *src, size_t size)
 {
+        HR_DEBUG("%s()", __func__);
+
         hr_volume_t *vol = bd->srvs->sarg;
         errno_t rc;