Changeset b127da2f in mainline
- Timestamp:
- 2025-07-11T19:48:47Z (2 weeks ago)
- Children:
- ca212a51
- Parents:
- 9c3369b
- Location:
- uspace/srv/bd/hr
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/bd/hr/metadata/foreign/geom/hr_g_mirror.c
r9c3369b rb127da2f 189 189 190 190 vol->extents[index].svc_id = iter->svc_id; 191 iter->fini = false;192 191 193 192 bool invalidate = false; -
uspace/srv/bd/hr/metadata/foreign/geom/hr_g_stripe.c
r9c3369b rb127da2f 189 189 190 190 vol->extents[index].svc_id = iter->svc_id; 191 iter->fini = false;192 191 193 192 vol->extents[index].state = HR_EXT_ONLINE; -
uspace/srv/bd/hr/metadata/foreign/md/hr_md.c
r9c3369b rb127da2f 206 206 207 207 vol->extents[index].svc_id = iter->svc_id; 208 iter->fini = false;209 208 210 209 bool invalidate = false; -
uspace/srv/bd/hr/metadata/foreign/softraid/hr_softraid.c
r9c3369b rb127da2f 189 189 190 190 vol->extents[index].svc_id = iter->svc_id; 191 iter->fini = false;192 191 193 192 struct sr_meta_chunk *mc = -
uspace/srv/bd/hr/metadata/native.c
r9c3369b rb127da2f 204 204 205 205 vol->extents[iter_meta->index].svc_id = iter->svc_id; 206 iter->fini = false;207 206 208 207 hr_ext_state_t final_ext_state = HR_EXT_INVALID; -
uspace/srv/bd/hr/util.c
r9c3369b rb127da2f 621 621 to_add->svc_id = svc_id; 622 622 to_add->inited = inited; 623 to_add->fini = true; 623 624 624 625 if (md != NULL) { … … 858 859 goto error; 859 860 861 for (size_t e = 0; e < vol->extent_no; e++) { 862 if (vol->extents[e].svc_id == 0) 863 continue; 864 list_foreach(*list, link, struct dev_list_member, iter) { 865 if (iter->svc_id == vol->extents[e].svc_id) 866 iter->fini = false; 867 } 868 } 869 860 870 rc = hr_register_volume(vol); 861 871 if (rc != EOK) … … 870 880 return EOK; 871 881 error: 882 /* let the caller fini the block svc list */ 883 for (size_t e = 0; e < vol->extent_no; e++) 884 vol->extents[e].svc_id = 0; 885 872 886 hr_destroy_vol_struct(vol); 887 873 888 return rc; 874 889 } … … 945 960 } 946 961 947 if (rc != EOK) 948 goto error; 962 if (rc != EOK) { 963 block_fini(iter->svc_id); 964 free_dev_list_member(iter); 965 goto error; 966 } 949 967 950 968 char *svc_name = NULL; 951 969 rc = loc_service_get_name(iter->svc_id, &svc_name); 952 if (rc != EOK) 953 goto error; 970 if (rc != EOK) { 971 block_fini(iter->svc_id); 972 free_dev_list_member(iter); 973 goto error; 974 } 954 975 HR_DEBUG("found valid metadata on %s (type = %s), matching " 955 976 "other extents\n", … … 962 983 rc = hr_util_get_matching_md_svcs_list(&matching_svcs_list, 963 984 &dev_id_list, iter->svc_id, type, metadata_struct_main); 964 if (rc != EOK) 965 goto error; 985 if (rc != EOK) { 986 block_fini(iter->svc_id); 987 free_dev_list_member(iter); 988 goto error; 989 } 966 990 967 991 /* add current iter to list as well */ … … 969 993 iter->svc_id, true, metadata_struct_main); 970 994 if (rc != EOK) { 995 block_fini(iter->svc_id); 971 996 free_svc_id_list(&matching_svcs_list); 972 997 goto error; 973 998 } 999 1000 free_dev_list_member(iter); 974 1001 975 1002 /* remove matching list members from dev_id_list */
Note:
See TracChangeset
for help on using the changeset viewer.