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

Timestamp:

2025-04-21T12:47:58Z (4 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

5cb1631

Parents:

75262d2f

Message:

hr: move metadata_type_t to lib/hr for type printing

Also renames metadata_type_t → hr_metadata_type_t.

File:

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

uspace/srv/bd/hr/util.c

@@ -64 +64 @@
 static void     block_fini_dev_list(list_t *);
 static errno_t  hr_util_get_matching_md_svcs_list(list_t *, list_t *,
-    service_id_t, metadata_type_t, void *);
-static errno_t  hr_util_assemble_from_matching_list(list_t *, metadata_type_t);
+    service_id_t, hr_metadata_type_t, void *);
+static errno_t  hr_util_assemble_from_matching_list(list_t *, hr_metadata_type_t);
 static errno_t  hr_fill_svcs_list_from_cfg(hr_config_t *, list_t *);
 
@@ -77 +77 @@
 
 errno_t hr_create_vol_struct(hr_volume_t **rvol, hr_level_t level,
-    const char *devname, metadata_type_t metadata_type)
+    const char *devname, hr_metadata_type_t metadata_type)
 {
         errno_t rc;
@@ -752 +752 @@
 
 static errno_t hr_util_get_matching_md_svcs_list(list_t *rlist, list_t *list,
-    service_id_t svc_id, metadata_type_t type_main, void *metadata_struct_main)
+    service_id_t svc_id, hr_metadata_type_t type_main,
+    void *metadata_struct_main)
 {
         HR_DEBUG("%s()", __func__);
@@ -765 +766 @@
 
                 void *metadata_struct;
-                metadata_type_t type;
+                hr_metadata_type_t type;
 
                 rc = find_metadata(iter->svc_id, &metadata_struct, &type);
@@ -797 +798 @@
 
 static errno_t hr_util_assemble_from_matching_list(list_t *list,
-    metadata_type_t type)
+    hr_metadata_type_t type)
 {
         HR_DEBUG("%s()", __func__);
@@ -930 +931 @@
 
                 void *metadata_struct_main;
-                metadata_type_t type;
+                hr_metadata_type_t type;
 
                 rc = find_metadata(iter->svc_id, &metadata_struct_main, &type);
@@ -947 +948 @@
                 if (rc != EOK)
                         goto error;
-
-                HR_DEBUG("found valid metadata on %s, "
-                    "will try to match other extents\n", svc_name);
-
+                HR_DEBUG("found valid metadata on %s (type = %s), matching "
+                    "other extents\n",
+                    svc_name, hr_get_metadata_type_str(type));
                 free(svc_name);