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

Timestamp:

2025-05-07T11:27:25Z (4 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

964e897

Parents:

155d34f

git-author:

Miroslav Cimerman <mc@…> (2025-05-07 11:26:23)

git-committer:

Miroslav Cimerman <mc@…> (2025-05-07 11:27:25)

Message:

hr: rename all strings status' -> state'

File:

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

uspace/srv/bd/hr/raid0.c

@@ -53 +53 @@
 #include "var.h"
 
-static void     hr_raid0_update_vol_status(hr_volume_t *);
+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,
@@ -92 +92 @@
         }
 
-        hr_raid0_update_vol_status(new_volume);
-        if (new_volume->status != HR_VOL_ONLINE) {
+        hr_raid0_update_vol_state(new_volume);
+        if (new_volume->state != HR_VOL_ONLINE) {
                 HR_NOTE("\"%s\": unusable state, not creating\n",
                     new_volume->devname);
@@ -130 +130 @@
 }
 
-void hr_raid0_status_event(hr_volume_t *vol)
-{
-        HR_DEBUG("%s()", __func__);
-
-        hr_raid0_update_vol_status(vol);
+void hr_raid0_state_event(hr_volume_t *vol)
+{
+        HR_DEBUG("%s()", __func__);
+
+        hr_raid0_update_vol_state(vol);
 }
 
@@ -192 +192 @@
 }
 
-static void hr_raid0_update_vol_status(hr_volume_t *vol)
+static void hr_raid0_update_vol_state(hr_volume_t *vol)
 {
         fibril_mutex_lock(&vol->md_lock);
@@ -203 +203 @@
         fibril_rwlock_read_lock(&vol->states_lock);
 
-        hr_vol_status_t old_state = vol->status;
+        hr_vol_state_t old_state = vol->state;
 
         for (size_t i = 0; i < vol->extent_no; i++) {
-                if (vol->extents[i].status != HR_EXT_ONLINE) {
+                if (vol->extents[i].state != HR_EXT_ONLINE) {
                         fibril_rwlock_read_unlock(&vol->states_lock);
 
                         if (old_state != HR_VOL_FAULTY) {
                                 fibril_rwlock_write_lock(&vol->states_lock);
-                                hr_update_vol_status(vol, HR_VOL_FAULTY);
+                                hr_update_vol_state(vol, HR_VOL_FAULTY);
                                 fibril_rwlock_write_unlock(&vol->states_lock);
                         }
@@ -221 +221 @@
         if (old_state != HR_VOL_ONLINE) {
                 fibril_rwlock_write_lock(&vol->states_lock);
-                hr_update_vol_status(vol, HR_VOL_ONLINE);
+                hr_update_vol_state(vol, HR_VOL_ONLINE);
                 fibril_rwlock_write_unlock(&vol->states_lock);
         }
@@ -235 +235 @@
         switch (rc) {
         case ENOENT:
-                hr_update_ext_status(vol, extent, HR_EXT_MISSING);
+                hr_update_ext_state(vol, extent, HR_EXT_MISSING);
                 break;
         default:
-                hr_update_ext_status(vol, extent, HR_EXT_FAILED);
-        }
-
-        hr_update_vol_status(vol, HR_VOL_FAULTY);
+                hr_update_ext_state(vol, extent, HR_EXT_FAILED);
+        }
+
+        hr_update_vol_state(vol, HR_VOL_FAULTY);
 
         fibril_rwlock_write_unlock(&vol->states_lock);
@@ -257 +257 @@
 
         fibril_rwlock_read_lock(&vol->states_lock);
-        if (vol->status != HR_VOL_ONLINE) {
+        if (vol->state != HR_VOL_ONLINE) {
                 fibril_rwlock_read_unlock(&vol->states_lock);
                 return EIO;