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

Timestamp:

2025-07-04T10:14:23Z (3 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

974f9ba

Parents:

b247c714

Message:

hr: rebuild: fix deadlock on extents_lock

File:

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

uspace/srv/bd/hr/raid1.c

@@ -185 +185 @@
         size_t rebuild_no = hr_count_extents(vol, HR_EXT_REBUILD);
 
+        fibril_rwlock_read_unlock(&vol->states_lock);
+        fibril_rwlock_read_unlock(&vol->extents_lock);
+
         fibril_mutex_lock(&vol->hotspare_lock);
         size_t hs_no = vol->hotspare_no;
         fibril_mutex_unlock(&vol->hotspare_lock);
-
-        fibril_rwlock_read_unlock(&vol->states_lock);
-        fibril_rwlock_read_unlock(&vol->extents_lock);
 
         if (healthy == 0) {
@@ -206 +206 @@
                 }
 
-                if (old_state != HR_VOL_REBUILD) {
-                        if (hs_no > 0 || invalid_no > 0 || rebuild_no > 0) {
-                                fid_t fib = fibril_create(hr_raid1_rebuild,
-                                    vol);
-                                if (fib == 0)
-                                        return;
-                                fibril_start(fib);
-                                fibril_detach(fib);
-                        }
+                if (hs_no > 0 || invalid_no > 0 || rebuild_no > 0) {
+                        fid_t fib = fibril_create(hr_raid1_rebuild, vol);
+                        if (fib == 0)
+                                return;
+                        fibril_start(fib);
+                        fibril_detach(fib);
                 }
         } else {
@@ -541 +538 @@
         hr_mark_vol_state_dirty(vol);
 
+        hr_update_vol_state(vol, HR_VOL_DEGRADED);
+
         fibril_rwlock_write_unlock(&vol->states_lock);
 end: