Changeset f0360ec in mainline for uspace/srv/bd/hr/io.c

Timestamp:

2025-06-17T22:33:02Z (8 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

f0cc1c64

Parents:

3c518fc

Message:

hr: RAID 0, 1: use ENOMEM safe primitives

File:

• uspace/srv/bd/hr/io.c (modified) (3 diffs)

uspace/srv/bd/hr/io.c

@@ -48 +48 @@
 #include "var.h"
 
-static errno_t exec_io_op(hr_io_t *);
-
 /** Wrapper for block_write_direct(), never returns ENOMEM */
 errno_t hr_write_direct(service_id_t service_id, uint64_t ba, size_t cnt,
@@ -95 +93 @@
         hr_io_t *io = arg;
 
-        errno_t rc = exec_io_op(io);
-
-        /*
-         * We don't have to invalidate extents who got ENOMEM
-         * on READ/SYNC. But when we get ENOMEM on a WRITE, we have
-         * to invalidate it, because there could have been
-         * other writes, there is no way to rollback.
-         */
-        if (rc != EOK && (rc != ENOMEM || io->type == HR_BD_WRITE))
-                io->vol->hr_ops.ext_state_cb(io->vol, io->extent, rc);
-
-        return rc;
-}
-
-errno_t hr_io_worker_basic(void *arg)
-{
-        hr_io_t *io = arg;
-
-        errno_t rc = exec_io_op(io);
+        errno_t rc;
+        size_t e = io->extent;
+        hr_extent_t *extents = (hr_extent_t *)&io->vol->extents;
+
+        switch (io->type) {
+        case HR_BD_READ:
+                rc = hr_read_direct(extents[e].svc_id, io->ba, io->cnt,
+                    io->data_read);
+                break;
+        case HR_BD_WRITE:
+                rc = hr_write_direct(extents[e].svc_id, io->ba, io->cnt,
+                    io->data_write);
+                break;
+        default:
+                assert(0);
+        }
+
+        if (rc != EOK)
+                io->vol->hr_ops.ext_state_cb(io->vol, io->extent, rc);
 
         return rc;
@@ -322 +320 @@
 }
 
-static errno_t exec_io_op(hr_io_t *io)
-{
-        size_t ext_idx = io->extent;
-        hr_extent_t *extents = (hr_extent_t *)&io->vol->extents;
-        errno_t rc;
-
-        const char *debug_type_str = NULL;
-        switch (io->type) {
-        case HR_BD_SYNC:
-                debug_type_str = "SYNC";
-                break;
-        case HR_BD_READ:
-                debug_type_str = "READ";
-                break;
-        case HR_BD_WRITE:
-                debug_type_str = "WRITE";
-                break;
-        }
-
-        HR_DEBUG("%s WORKER (%p) on extent: %zu, ba: %" PRIu64 ", "
-            "cnt: %" PRIu64 "\n",
-            debug_type_str, io, io->extent, io->ba, io->cnt);
-
-        switch (io->type) {
-        case HR_BD_SYNC:
-                rc = block_sync_cache(extents[ext_idx].svc_id,
-                    io->ba, io->cnt);
-                if (rc == ENOTSUP)
-                        rc = EOK;
-                break;
-        case HR_BD_READ:
-                rc = block_read_direct(extents[ext_idx].svc_id, io->ba,
-                    io->cnt, io->data_read);
-                break;
-        case HR_BD_WRITE:
-                rc = block_write_direct(extents[ext_idx].svc_id, io->ba,
-                    io->cnt, io->data_write);
-                break;
-        default:
-                assert(0);
-        }
-
-        HR_DEBUG("WORKER (%p) rc: %s\n", io, str_error(rc));
-
-        return rc;
-}
-
 /** @}
  */