Changeset 4d30c475 in mainline

Timestamp:

2025-03-06T19:40:24Z (2 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

6123753

Parents:

b15e534

Message:

hr: raid1.c: fix rebuild

File:

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

uspace/srv/bd/hr/raid1.c

@@ -533 +533 @@
         hr_add_ba_offset(vol, &ba);
 
+        /*
+         * XXX: this is useless here after simplified DI, because
+         * rebuild cannot be triggered while ongoing rebuild
+         */
         fibril_rwlock_read_lock(&vol->extents_lock);
 
@@ -538 +542 @@
 
         while (left != 0) {
-                if (vol->halt_please) {
-                        fibril_rwlock_read_unlock(&vol->extents_lock);
-                        fibril_mutex_lock(&vol->halt_lock);
-                        fibril_mutex_unlock(&vol->halt_lock);
-                        fibril_rwlock_read_lock(&vol->extents_lock);
-                }
-
                 cnt = min(max_blks, left);
 
@@ -573 +570 @@
 
         hr_update_ext_status(vol, rebuild_idx, HR_EXT_ONLINE);
+
         /*
          * We can be optimistic here, if some extents are
@@ -723 +721 @@
         hr_extent_t *ext, *rebuild_ext = &vol->extents[rebuild_idx];
 
+        fibril_rwlock_read_lock(&vol->states_lock);
+        hr_ext_status_t rebuild_ext_status = rebuild_ext->status;
+        fibril_rwlock_read_unlock(&vol->states_lock);
+
+        if (rebuild_ext_status != HR_EXT_REBUILD)
+                return EINVAL;
+
         for (size_t i = 0; i < vol->extent_no; i++) {
                 fibril_rwlock_read_lock(&vol->states_lock);
-
                 ext = &vol->extents[i];
-                if (ext->status != HR_EXT_ONLINE)
+                if (ext->status != HR_EXT_ONLINE) {
+                        fibril_rwlock_read_unlock(&vol->states_lock);
                         continue;
-
+                }
                 fibril_rwlock_read_unlock(&vol->states_lock);