Changeset c9ce6d22 in mainline for uspace/srv/bd/hr/hr.c

Timestamp:

2025-05-15T19:24:51Z (3 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

a2281efc

Parents:

9a3eec1

Message:

hr: refactor volume removal

File:

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

uspace/srv/bd/hr/hr.c

@@ -296 +296 @@
         errno_t rc = EOK;
         service_id_t svc_id;
-        hr_volume_t *vol;
 
         svc_id = ipc_get_arg1(icall);
 
-        vol = hr_get_volume(svc_id);
-        if (vol == NULL) {
-                async_answer_0(icall, ENOENT);
-                return;
-        }
-
-        rc = hr_remove_volume(vol);
+        rc = hr_remove_volume(svc_id);
 
         async_answer_0(icall, rc);
@@ -319 +312 @@
         HR_DEBUG("%s()", __func__);
 
-        hr_volume_t *vol;
+        service_id_t *vol_svcs = NULL;
         errno_t rc = EOK;
-
-        while (true) {
-                fibril_rwlock_write_lock(&hr_volumes_lock);
-                if (list_empty(&hr_volumes)) {
-                        fibril_rwlock_write_unlock(&hr_volumes_lock);
-                        break;
-                }
-
-                vol = list_pop(&hr_volumes, hr_volume_t, lvolumes);
-
-                fibril_rwlock_write_unlock(&hr_volumes_lock);
-
-                rc = hr_remove_volume(vol);
+        size_t i, vol_cnt;
+
+        rc = hr_get_volume_svcs(&vol_cnt, &vol_svcs);
+        if (rc != EOK)
+                goto fail;
+
+        for (i = 0; i < vol_cnt; i++) {
+                rc = hr_remove_volume(vol_svcs[i]);
                 if (rc != EOK)
                         break;
         }
 
+fail:
+        if (vol_svcs != NULL)
+                free(vol_svcs);
         async_answer_0(icall, rc);
 }