Changeset aa9bad8 in mainline for uspace/srv/bd/hr/superblock.c

Timestamp:

2025-06-27T22:21:05Z (4 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

2de7c1f

Parents:

78433bb

git-author:

Miroslav Cimerman <mc@…> (2025-06-27 22:14:37)

git-committer:

Miroslav Cimerman <mc@…> (2025-06-27 22:21:05)

Message:

hr: let each format implement own probe

This will allow metadata to have superblocks in
different locations accross versions.

This also greatly reduces the format handling interface,
because now, functions used by the probing done
publicly in superblock.c are now used just
inside specific metadata format code.

File:

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

uspace/srv/bd/hr/superblock.c

@@ -68 +68 @@
 };
 
-hr_superblock_ops_t *get_type_ops(hr_metadata_type_t type)
+hr_superblock_ops_t *hr_get_meta_type_ops(hr_metadata_type_t type)
 {
         assert(type >= HR_METADATA_NATIVE && type < HR_METADATA_LAST_DUMMY);
@@ -75 +75 @@
 }
 
-errno_t find_metadata(service_id_t svc_id, void **rmetadata,
+errno_t hr_find_metadata(service_id_t svc_id, void **rmetadata,
     hr_metadata_type_t *rtype)
 {
@@ -82 +82 @@
         errno_t rc;
         hr_superblock_ops_t *meta_ops;
-        void *meta_block;
         void *metadata_struct;
 
@@ -94 +93 @@
                 meta_ops = hr_superblock_ops_all[type];
 
-                metadata_struct = meta_ops->alloc_struct();
-                if (metadata_struct == NULL)
-                        return ENOMEM;
-
-                rc = meta_ops->get_block(svc_id, &meta_block);
-                if (rc == ENOMEM) {
-                        free(metadata_struct);
-                        return ENOMEM;
-                } else if (rc != EOK) {
-                        free(metadata_struct);
-                        continue;
-                }
-
-                rc = meta_ops->decode(meta_block, metadata_struct);
-
-                free(meta_block);
-
+                rc = meta_ops->probe(svc_id, &metadata_struct);
                 if (rc != EOK) {
-                        free(metadata_struct);
-                        continue;
-                }
-
-                if (!meta_ops->has_valid_magic(metadata_struct)) {
-                        free(metadata_struct);
+                        if (rc != ENOFS)
+                                return rc;
                         continue;
                 }