Changeset c9ce6d22 in mainline for uspace/srv/bd/hr/util.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/util.c (modified) (3 diffs)

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