Changeset c9ce6d22 in mainline

Timestamp:

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

Author:

Miroslav Cimerman <mc@…>

Children:

a2281efc

Parents:

9a3eec1

Message:

hr: refactor volume removal

Location:

uspace/srv/bd/hr

Files:

• hr.c (modified) (2 diffs)
• util.c (modified) (3 diffs)
• util.h (modified) (1 diff)

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);
 }

uspace/srv/bd/hr/util.c

@@ -215 +215 @@
                 }
         }
-
         fibril_rwlock_read_unlock(&hr_volumes_lock);
+
         return rvol;
 }
 
-errno_t hr_remove_volume(hr_volume_t *vol)
-{
-        HR_DEBUG("%s()", __func__);
+errno_t hr_remove_volume(service_id_t svc_id)
+{
+        HR_DEBUG("%s()", __func__);
+
+        hr_volume_t *vol = hr_get_volume(svc_id);
+        if (vol == NULL)
+                return ENOENT;
 
         fibril_rwlock_write_lock(&hr_volumes_lock);
@@ -228 +232 @@
         int open_cnt = atomic_load_explicit(&vol->open_cnt,
             memory_order_relaxed);
+
         /*
          * The atomicity of this if condition (and this whole
@@ -246 +251 @@
         /* save metadata, but we don't care about states anymore */
         (void)vol->meta_ops->save(vol, NO_STATE_CALLBACK);
-
-        service_id_t svc_id = vol->svc_id;
 
         HR_NOTE("deactivating volume \"%s\"\n", vol->devname);

uspace/srv/bd/hr/util.h

@@ -72 +72 @@
 extern errno_t           hr_get_volume_svcs(size_t *, service_id_t **);
 extern hr_volume_t      *hr_get_volume(service_id_t);
-extern errno_t           hr_remove_volume(hr_volume_t *);
+extern errno_t           hr_remove_volume(service_id_t);
 extern errno_t           hr_init_extents_from_cfg(hr_volume_t *, hr_config_t *);
 extern void              hr_fini_devs(hr_volume_t *);