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

Timestamp:

2025-07-04T10:14:23Z (9 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

974f9ba

Parents:

b247c714

Message:

hr: rebuild: fix deadlock on extents_lock

File:

• uspace/srv/bd/hr/util.c (modified) (2 diffs)

uspace/srv/bd/hr/util.c

@@ -1110 +1110 @@
 errno_t hr_init_rebuild(hr_volume_t *vol, size_t *rebuild_idx)
 {
+        HR_DEBUG("%s()", __func__);
+
         errno_t rc = EOK;
         size_t bad = vol->extent_no;
@@ -1115 +1117 @@
         if (vol->level == HR_LVL_0)
                 return EINVAL;
+
+        fibril_rwlock_read_lock(&vol->states_lock);
+        if (vol->state != HR_VOL_DEGRADED) {
+                fibril_rwlock_read_unlock(&vol->states_lock);
+                return EINVAL;
+        }
+        fibril_rwlock_read_unlock(&vol->states_lock);
 
         fibril_rwlock_write_lock(&vol->extents_lock);
         fibril_rwlock_write_lock(&vol->states_lock);
         fibril_mutex_lock(&vol->hotspare_lock);
-
-        if (vol->state != HR_VOL_DEGRADED) {
-                rc = EINVAL;
-                goto error;
-        }
 
         size_t rebuild = vol->extent_no;