Changeset 263a2389 in mainline

Timestamp:

2025-06-22T07:26:20Z (5 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

c2d737d

Parents:

81b4c795

Message:

hr: rename volume state ONLINE to OPTIMAL

Location:

uspace

Files:

• lib/device/include/hr.h (modified) (1 diff)
• lib/device/src/hr.c (modified) (1 diff)
• srv/bd/hr/raid0.c (modified) (3 diffs)
• srv/bd/hr/raid1.c (modified) (2 diffs)
• srv/bd/hr/raid5.c (modified) (1 diff)

uspace/lib/device/include/hr.h

@@ -66 +66 @@
 typedef enum hr_vol_state {
         HR_VOL_NONE = 0, /* Unknown/None */
-        HR_VOL_ONLINE, /* optimal */
+        HR_VOL_OPTIMAL, /* optimal */
         HR_VOL_FAULTY, /* unusable */
         HR_VOL_DEGRADED, /* not optimal */

uspace/lib/device/src/hr.c

@@ -446 +446 @@
         case HR_VOL_NONE:
                 return "NONE/UNKNOWN";
-        case HR_VOL_ONLINE:
-                return "ONLINE";
+        case HR_VOL_OPTIMAL:
+                return "OPTIMAL";
         case HR_VOL_FAULTY:
                 return "FAULTY";

uspace/srv/bd/hr/raid0.c

@@ -92 +92 @@
 
         hr_raid0_vol_state_eval(new_volume);
-        if (new_volume->state != HR_VOL_ONLINE) {
+        if (new_volume->state != HR_VOL_OPTIMAL) {
                 HR_NOTE("\"%s\": unusable state, not creating\n",
                     new_volume->devname);
@@ -155 +155 @@
         fibril_rwlock_read_unlock(&vol->states_lock);
 
-        if (old_state != HR_VOL_ONLINE) {
+        if (old_state != HR_VOL_OPTIMAL) {
                 fibril_rwlock_write_lock(&vol->states_lock);
-                hr_update_vol_state(vol, HR_VOL_ONLINE);
+                hr_update_vol_state(vol, HR_VOL_OPTIMAL);
                 fibril_rwlock_write_unlock(&vol->states_lock);
         }
@@ -257 +257 @@
 
         fibril_rwlock_read_lock(&vol->states_lock);
-        if (vol->state != HR_VOL_ONLINE) {
+        if (vol->state != HR_VOL_OPTIMAL) {
                 fibril_rwlock_read_unlock(&vol->states_lock);
                 return EIO;

uspace/srv/bd/hr/raid1.c

@@ -228 +228 @@
                 }
         } else {
-                if (old_state != HR_VOL_ONLINE) {
+                if (old_state != HR_VOL_OPTIMAL) {
                         fibril_rwlock_write_lock(&vol->states_lock);
-                        hr_update_vol_state(vol, HR_VOL_ONLINE);
+                        hr_update_vol_state(vol, HR_VOL_OPTIMAL);
                         fibril_rwlock_write_unlock(&vol->states_lock);
                 }
@@ -526 +526 @@
          * state accordingly.
          */
-        hr_update_vol_state(vol, HR_VOL_ONLINE);
+        hr_update_vol_state(vol, HR_VOL_OPTIMAL);
         hr_mark_vol_state_dirty(vol);
 

uspace/srv/bd/hr/raid5.c

@@ -625 +625 @@
         switch (bad) {
         case 0:
-                if (state != HR_VOL_ONLINE)
-                        hr_update_vol_state(vol, HR_VOL_ONLINE);
+                if (state != HR_VOL_OPTIMAL)
+                        hr_update_vol_state(vol, HR_VOL_OPTIMAL);
                 break;
         case 1: