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

Timestamp:

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

Author:

Miroslav Cimerman <mc@…>

Children:

f0cc1c64

Parents:

3c518fc

Message:

hr: RAID 0, 1: use ENOMEM safe primitives

File:

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

uspace/srv/bd/hr/raid1.c

@@ -174 +174 @@
 
         switch (rc) {
-        case ENOMEM:
-                hr_update_ext_state(vol, extent, HR_EXT_INVALID);
-                break;
         case ENOENT:
                 hr_update_ext_state(vol, extent, HR_EXT_MISSING);
@@ -372 +369 @@
                         }
 
-                        rc = block_read_direct(vol->extents[i].svc_id, ba, cnt,
+                        rc = hr_read_direct(vol->extents[i].svc_id, ba, cnt,
                             data_read);
-
-                        if (rc == ENOMEM && i + 1 == vol->extent_no)
-                                goto end;
-
-                        if (rc == ENOMEM)
-                                continue;
-
                         if (rc != EOK) {
                                 hr_raid1_ext_state_cb(vol, i, rc);
@@ -389 +379 @@
                 }
                 break;
-        case HR_BD_SYNC:
         case HR_BD_WRITE:
-                if (type == HR_BD_WRITE) {
-                        rl = hr_range_lock_acquire(vol, ba, cnt);
-                        if (rl == NULL) {
-                                rc = ENOMEM;
-                                goto end;
-                        }
-                }
+                rl = hr_range_lock_acquire(vol, ba, cnt);
 
                 fibril_rwlock_read_lock(&vol->states_lock);
@@ -408 +391 @@
 
                 hr_fgroup_t *group = hr_fgroup_create(vol->fge, good);
-                if (group == NULL) {
-                        if (type == HR_BD_WRITE)
-                                hr_range_lock_release(rl);
-                        rc = ENOMEM;
-                        fibril_rwlock_read_unlock(&vol->states_lock);
-                        goto end;
-                }
 
                 for (i = 0; i < vol->extent_no; i++) {
@@ -446 +422 @@
                 (void)hr_fgroup_wait(group, &successful, NULL);
 
-                if (type == HR_BD_WRITE)
-                        hr_range_lock_release(rl);
+                hr_range_lock_release(rl);
 
                 break;
         default:
-                rc = EINVAL;
-                goto end;
+                assert(0);
         }
 
@@ -460 +434 @@
                 rc = EIO;
 
-end:
         fibril_rwlock_read_unlock(&vol->extents_lock);