Changeset ee47537 in mainline

Timestamp:

2025-01-12T16:12:38Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

58d82fa

Parents:

4660649

Message:

hr: RAID0: refactor hr_raid0_update_vol_status()

File:

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

uspace/srv/bd/hr/raid0.c

@@ -55 +55 @@
 extern loc_srv_t *hr_srv;
 
-static errno_t hr_raid0_update_vol_status(hr_volume_t *);
+static void hr_raid0_update_vol_status(hr_volume_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);
@@ -91 +91 @@
         }
 
-        rc = hr_raid0_update_vol_status(new_volume);
-        if (rc != EOK)
-                return rc;
-
-        hr_update_vol_status(new_volume, HR_VOL_ONLINE);
+        hr_raid0_update_vol_status(new_volume);
+        if (new_volume->status != HR_VOL_ONLINE)
+                return EINVAL;
 
         bd_srvs_init(&new_volume->hr_bds);
@@ -129 +127 @@
 void hr_raid0_status_event(hr_volume_t *vol)
 {
-        (void)hr_raid0_update_vol_status(vol);
+        hr_raid0_update_vol_status(vol);
 }
 
@@ -177 +175 @@
 }
 
-/*
- * Update vol->status and return EOK if volume
- * is usable
- */
-static errno_t hr_raid0_update_vol_status(hr_volume_t *vol)
+static void hr_raid0_update_vol_status(hr_volume_t *vol)
 {
         fibril_rwlock_read_lock(&vol->states_lock);
+
         hr_vol_status_t old_state = vol->status;
 
@@ -189 +184 @@
                 if (vol->extents[i].status != HR_EXT_ONLINE) {
                         fibril_rwlock_read_unlock(&vol->states_lock);
-                        fibril_rwlock_write_lock(&vol->states_lock);
-                        if (old_state != HR_VOL_FAULTY)
+
+                        if (old_state != HR_VOL_FAULTY) {
+                                fibril_rwlock_write_lock(&vol->states_lock);
                                 hr_update_vol_status(vol, HR_VOL_FAULTY);
-                        fibril_rwlock_write_unlock(&vol->states_lock);
-                        return EIO;
+                                fibril_rwlock_write_unlock(&vol->states_lock);
+                        }
+                        return;
                 }
         }
         fibril_rwlock_read_unlock(&vol->states_lock);
 
-        return EOK;
+        if (old_state != HR_VOL_ONLINE) {
+                fibril_rwlock_write_lock(&vol->states_lock);
+                hr_update_vol_status(vol, HR_VOL_ONLINE);
+                fibril_rwlock_write_unlock(&vol->states_lock);
+        }
 }