Changeset 46577995 in mainline for uspace/srv/fs
- Timestamp:
- 2018-01-04T20:50:52Z (8 years ago)
- Children:
- e211ea04
- Parents:
- facacc71
- git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:47:53)
- git-committer:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:50:52)
- Location:
- uspace/srv/fs
- Files:
-
- 41 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/fs/cdfs/cdfs.c
rfacacc71 r46577995 82 82 } 83 83 84 int rc = fs_register(vfs_sess, &cdfs_vfs_info, &cdfs_ops,84 errno_t rc = fs_register(vfs_sess, &cdfs_vfs_info, &cdfs_ops, 85 85 &cdfs_libfs_ops); 86 86 if (rc != EOK) { -
uspace/srv/fs/cdfs/cdfs_ops.c
rfacacc71 r46577995 331 331 }; 332 332 333 static int cdfs_node_get(fs_node_t **rfn, service_id_t service_id,333 static errno_t cdfs_node_get(fs_node_t **rfn, service_id_t service_id, 334 334 fs_index_t index) 335 335 { … … 351 351 } 352 352 353 static int cdfs_root_get(fs_node_t **rfn, service_id_t service_id)353 static errno_t cdfs_root_get(fs_node_t **rfn, service_id_t service_id) 354 354 { 355 355 return cdfs_node_get(rfn, service_id, CDFS_SOME_ROOT); … … 371 371 } 372 372 373 static int create_node(fs_node_t **rfn, cdfs_t *fs, int lflag,373 static errno_t create_node(fs_node_t **rfn, cdfs_t *fs, int lflag, 374 374 fs_index_t index) 375 375 { … … 392 392 393 393 fs_node_t *rootfn; 394 int rc = cdfs_root_get(&rootfn, fs->service_id);394 errno_t rc = cdfs_root_get(&rootfn, fs->service_id); 395 395 396 396 assert(rc == EOK); … … 417 417 } 418 418 419 static int link_node(fs_node_t *pfn, fs_node_t *fn, const char *name)419 static errno_t link_node(fs_node_t *pfn, fs_node_t *fn, const char *name) 420 420 { 421 421 cdfs_node_t *parent = CDFS_NODE(pfn); … … 460 460 static char *cdfs_decode_str(void *data, size_t dsize, cdfs_enc_t enc) 461 461 { 462 int rc;462 errno_t rc; 463 463 char *str; 464 464 uint16_t *buf; … … 566 566 } 567 567 568 static int cdfs_readdir(cdfs_t *fs, fs_node_t *fs_node)568 static errno_t cdfs_readdir(cdfs_t *fs, fs_node_t *fs_node) 569 569 { 570 570 cdfs_node_t *node = CDFS_NODE(fs_node); … … 580 580 for (uint32_t i = 0; i < blocks; i++) { 581 581 block_t *block; 582 int rc = block_get(&block, fs->service_id, node->lba + i, BLOCK_FLAGS_NONE);582 errno_t rc = block_get(&block, fs->service_id, node->lba + i, BLOCK_FLAGS_NONE); 583 583 if (rc != EOK) 584 584 return rc; … … 614 614 615 615 fs_node_t *fn; 616 int rc = create_node(&fn, fs, dentry_type,616 errno_t rc = create_node(&fn, fs, dentry_type, 617 617 (node->lba + i) * BLOCK_SIZE + offset); 618 618 if (rc != EOK) … … 652 652 653 653 block_t *block; 654 int rc = block_get(&block, fs->service_id, lba, BLOCK_FLAGS_NONE);654 errno_t rc = block_get(&block, fs->service_id, lba, BLOCK_FLAGS_NONE); 655 655 if (rc != EOK) 656 656 return NULL; … … 698 698 } 699 699 700 static int cdfs_match(fs_node_t **fn, fs_node_t *pfn, const char *component)700 static errno_t cdfs_match(fs_node_t **fn, fs_node_t *pfn, const char *component) 701 701 { 702 702 cdfs_node_t *parent = CDFS_NODE(pfn); 703 703 704 704 if (!parent->processed) { 705 int rc = cdfs_readdir(parent->fs, pfn);705 errno_t rc = cdfs_readdir(parent->fs, pfn); 706 706 if (rc != EOK) 707 707 return rc; … … 719 719 } 720 720 721 static int cdfs_node_open(fs_node_t *fn)721 static errno_t cdfs_node_open(fs_node_t *fn) 722 722 { 723 723 cdfs_node_t *node = CDFS_NODE(fn); … … 730 730 } 731 731 732 static int cdfs_node_put(fs_node_t *fn)732 static errno_t cdfs_node_put(fs_node_t *fn) 733 733 { 734 734 /* Nothing to do */ … … 736 736 } 737 737 738 static int cdfs_create_node(fs_node_t **fn, service_id_t service_id, int lflag)738 static errno_t cdfs_create_node(fs_node_t **fn, service_id_t service_id, int lflag) 739 739 { 740 740 /* Read-only */ … … 742 742 } 743 743 744 static int cdfs_destroy_node(fs_node_t *fn)744 static errno_t cdfs_destroy_node(fs_node_t *fn) 745 745 { 746 746 /* Read-only */ … … 748 748 } 749 749 750 static int cdfs_link_node(fs_node_t *pfn, fs_node_t *cfn, const char *name)750 static errno_t cdfs_link_node(fs_node_t *pfn, fs_node_t *cfn, const char *name) 751 751 { 752 752 /* Read-only */ … … 754 754 } 755 755 756 static int cdfs_unlink_node(fs_node_t *pfn, fs_node_t *cfn, const char *name)756 static errno_t cdfs_unlink_node(fs_node_t *pfn, fs_node_t *cfn, const char *name) 757 757 { 758 758 /* Read-only */ … … 760 760 } 761 761 762 static int cdfs_has_children(bool *has_children, fs_node_t *fn)762 static errno_t cdfs_has_children(bool *has_children, fs_node_t *fn) 763 763 { 764 764 cdfs_node_t *node = CDFS_NODE(fn); … … 806 806 } 807 807 808 static int cdfs_size_block(service_id_t service_id, uint32_t *size)808 static errno_t cdfs_size_block(service_id_t service_id, uint32_t *size) 809 809 { 810 810 *size = BLOCK_SIZE; … … 813 813 } 814 814 815 static int cdfs_total_block_count(service_id_t service_id, uint64_t *count)815 static errno_t cdfs_total_block_count(service_id_t service_id, uint64_t *count) 816 816 { 817 817 *count = 0; … … 820 820 } 821 821 822 static int cdfs_free_block_count(service_id_t service_id, uint64_t *count)822 static errno_t cdfs_free_block_count(service_id_t service_id, uint64_t *count) 823 823 { 824 824 *count = 0; … … 851 851 /** Verify that escape sequence corresonds to one of the allowed encoding 852 852 * escape sequences allowed for Joliet. */ 853 static int cdfs_verify_joliet_esc_seq(uint8_t *seq)853 static errno_t cdfs_verify_joliet_esc_seq(uint8_t *seq) 854 854 { 855 855 size_t i, j, k; … … 895 895 * @return EOK if found, ENOENT if not 896 896 */ 897 static int cdfs_find_joliet_svd(service_id_t sid, cdfs_lba_t altroot,897 static errno_t cdfs_find_joliet_svd(service_id_t sid, cdfs_lba_t altroot, 898 898 uint32_t *rlba, uint32_t *rsize, char **vol_ident) 899 899 { … … 902 902 for (bi = altroot + 17; ; bi++) { 903 903 block_t *block; 904 int rc = block_get(&block, sid, bi, BLOCK_FLAGS_NONE);904 errno_t rc = block_get(&block, sid, bi, BLOCK_FLAGS_NONE); 905 905 if (rc != EOK) 906 906 break; … … 963 963 964 964 /** Read the volume descriptors. */ 965 static int iso_read_vol_desc(service_id_t sid, cdfs_lba_t altroot,965 static errno_t iso_read_vol_desc(service_id_t sid, cdfs_lba_t altroot, 966 966 uint32_t *rlba, uint32_t *rsize, cdfs_enc_t *enc, char **vol_ident) 967 967 { 968 968 /* First 16 blocks of isofs are empty */ 969 969 block_t *block; 970 int rc = block_get(&block, sid, altroot + 16, BLOCK_FLAGS_NONE);970 errno_t rc = block_get(&block, sid, altroot + 16, BLOCK_FLAGS_NONE); 971 971 if (rc != EOK) 972 972 return rc; … … 1036 1036 } 1037 1037 1038 static int iso_readfs(cdfs_t *fs, fs_node_t *rfn,1038 static errno_t iso_readfs(cdfs_t *fs, fs_node_t *rfn, 1039 1039 cdfs_lba_t altroot) 1040 1040 { 1041 1041 cdfs_node_t *node = CDFS_NODE(rfn); 1042 1042 1043 int rc = iso_read_vol_desc(fs->service_id, altroot, &node->lba,1043 errno_t rc = iso_read_vol_desc(fs->service_id, altroot, &node->lba, 1044 1044 &node->size, &fs->enc, &fs->vol_ident); 1045 1045 if (rc != EOK) … … 1064 1064 1065 1065 /* Create root node */ 1066 int rc = create_node(&rfn, fs, L_DIRECTORY, cdfs_index++);1066 errno_t rc = create_node(&rfn, fs, L_DIRECTORY, cdfs_index++); 1067 1067 1068 1068 if ((rc != EOK) || (!rfn)) … … 1086 1086 } 1087 1087 1088 static int cdfs_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)1088 static errno_t cdfs_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info) 1089 1089 { 1090 1090 char *vol_ident; 1091 1091 1092 1092 /* Initialize the block layer */ 1093 int rc = block_init(service_id, BLOCK_SIZE);1093 errno_t rc = block_init(service_id, BLOCK_SIZE); 1094 1094 if (rc != EOK) 1095 1095 return rc; … … 1144 1144 } 1145 1145 1146 static int cdfs_mounted(service_id_t service_id, const char *opts,1146 static errno_t cdfs_mounted(service_id_t service_id, const char *opts, 1147 1147 fs_index_t *index, aoff64_t *size) 1148 1148 { 1149 1149 /* Initialize the block layer */ 1150 int rc = block_init(service_id, BLOCK_SIZE);1150 errno_t rc = block_init(service_id, BLOCK_SIZE); 1151 1151 if (rc != EOK) 1152 1152 return rc; … … 1238 1238 } 1239 1239 1240 static int cdfs_unmounted(service_id_t service_id)1240 static errno_t cdfs_unmounted(service_id_t service_id) 1241 1241 { 1242 1242 cdfs_t *fs; … … 1250 1250 } 1251 1251 1252 static int cdfs_read(service_id_t service_id, fs_index_t index, aoff64_t pos,1252 static errno_t cdfs_read(service_id_t service_id, fs_index_t index, aoff64_t pos, 1253 1253 size_t *rbytes) 1254 1254 { … … 1266 1266 1267 1267 if (!node->processed) { 1268 int rc = cdfs_readdir(node->fs, FS_NODE(node));1268 errno_t rc = cdfs_readdir(node->fs, FS_NODE(node)); 1269 1269 if (rc != EOK) 1270 1270 return rc; … … 1290 1290 1291 1291 block_t *block; 1292 int rc = block_get(&block, service_id, node->lba + lba,1292 errno_t rc = block_get(&block, service_id, node->lba + lba, 1293 1293 BLOCK_FLAGS_NONE); 1294 1294 if (rc != EOK) { … … 1321 1321 } 1322 1322 1323 static int cdfs_write(service_id_t service_id, fs_index_t index, aoff64_t pos,1323 static errno_t cdfs_write(service_id_t service_id, fs_index_t index, aoff64_t pos, 1324 1324 size_t *wbytes, aoff64_t *nsize) 1325 1325 { … … 1332 1332 } 1333 1333 1334 static int cdfs_truncate(service_id_t service_id, fs_index_t index,1334 static errno_t cdfs_truncate(service_id_t service_id, fs_index_t index, 1335 1335 aoff64_t size) 1336 1336 { … … 1373 1373 } 1374 1374 1375 static int cdfs_close(service_id_t service_id, fs_index_t index)1375 static errno_t cdfs_close(service_id_t service_id, fs_index_t index) 1376 1376 { 1377 1377 /* Root node is always in memory */ … … 1399 1399 } 1400 1400 1401 static int cdfs_destroy(service_id_t service_id, fs_index_t index)1401 static errno_t cdfs_destroy(service_id_t service_id, fs_index_t index) 1402 1402 { 1403 1403 /* … … 1409 1409 } 1410 1410 1411 static int cdfs_sync(service_id_t service_id, fs_index_t index)1411 static errno_t cdfs_sync(service_id_t service_id, fs_index_t index) 1412 1412 { 1413 1413 /* -
uspace/srv/fs/exfat/exfat.c
rfacacc71 r46577995 72 72 } 73 73 74 int rc = exfat_idx_init();74 errno_t rc = exfat_idx_init(); 75 75 if (rc != EOK) 76 76 goto err; -
uspace/srv/fs/exfat/exfat.h
rfacacc71 r46577995 169 169 extern libfs_ops_t exfat_libfs_ops; 170 170 171 extern int exfat_idx_get_new(exfat_idx_t **, service_id_t);171 extern errno_t exfat_idx_get_new(exfat_idx_t **, service_id_t); 172 172 extern exfat_idx_t *exfat_idx_get_by_pos(service_id_t, exfat_cluster_t, unsigned); 173 173 extern exfat_idx_t *exfat_idx_get_by_index(service_id_t, fs_index_t); … … 176 176 extern void exfat_idx_hashout(exfat_idx_t *); 177 177 178 extern int exfat_idx_init(void);178 extern errno_t exfat_idx_init(void); 179 179 extern void exfat_idx_fini(void); 180 extern int exfat_idx_init_by_service_id(service_id_t);180 extern errno_t exfat_idx_init_by_service_id(service_id_t); 181 181 extern void exfat_idx_fini_by_service_id(service_id_t); 182 182 183 extern int exfat_node_expand(service_id_t, exfat_node_t *, exfat_cluster_t);184 extern int exfat_node_put(fs_node_t *);185 extern int exfat_bitmap_get(fs_node_t **, service_id_t);186 extern int exfat_uctable_get(fs_node_t **, service_id_t);183 extern errno_t exfat_node_expand(service_id_t, exfat_node_t *, exfat_cluster_t); 184 extern errno_t exfat_node_put(fs_node_t *); 185 extern errno_t exfat_bitmap_get(fs_node_t **, service_id_t); 186 extern errno_t exfat_uctable_get(fs_node_t **, service_id_t); 187 187 188 188 -
uspace/srv/fs/exfat/exfat_bitmap.c
rfacacc71 r46577995 48 48 49 49 50 int exfat_bitmap_is_free(exfat_bs_t *bs, service_id_t service_id,50 errno_t exfat_bitmap_is_free(exfat_bs_t *bs, service_id_t service_id, 51 51 exfat_cluster_t clst) 52 52 { … … 55 55 exfat_node_t *bitmapp; 56 56 uint8_t *bitmap; 57 int rc;57 errno_t rc; 58 58 bool alloc; 59 59 … … 89 89 } 90 90 91 int exfat_bitmap_set_cluster(exfat_bs_t *bs, service_id_t service_id,91 errno_t exfat_bitmap_set_cluster(exfat_bs_t *bs, service_id_t service_id, 92 92 exfat_cluster_t clst) 93 93 { … … 96 96 exfat_node_t *bitmapp; 97 97 uint8_t *bitmap; 98 int rc;98 errno_t rc; 99 99 100 100 clst -= EXFAT_CLST_FIRST; … … 124 124 } 125 125 126 int exfat_bitmap_clear_cluster(exfat_bs_t *bs, service_id_t service_id,126 errno_t exfat_bitmap_clear_cluster(exfat_bs_t *bs, service_id_t service_id, 127 127 exfat_cluster_t clst) 128 128 { … … 131 131 exfat_node_t *bitmapp; 132 132 uint8_t *bitmap; 133 int rc;133 errno_t rc; 134 134 135 135 clst -= EXFAT_CLST_FIRST; … … 160 160 } 161 161 162 int exfat_bitmap_set_clusters(exfat_bs_t *bs, service_id_t service_id,162 errno_t exfat_bitmap_set_clusters(exfat_bs_t *bs, service_id_t service_id, 163 163 exfat_cluster_t firstc, exfat_cluster_t count) 164 164 { 165 int rc;165 errno_t rc; 166 166 exfat_cluster_t clst; 167 167 clst = firstc; … … 180 180 } 181 181 182 int exfat_bitmap_clear_clusters(exfat_bs_t *bs, service_id_t service_id,182 errno_t exfat_bitmap_clear_clusters(exfat_bs_t *bs, service_id_t service_id, 183 183 exfat_cluster_t firstc, exfat_cluster_t count) 184 184 { 185 int rc;185 errno_t rc; 186 186 exfat_cluster_t clst; 187 187 clst = firstc; … … 196 196 } 197 197 198 int exfat_bitmap_alloc_clusters(exfat_bs_t *bs, service_id_t service_id,198 errno_t exfat_bitmap_alloc_clusters(exfat_bs_t *bs, service_id_t service_id, 199 199 exfat_cluster_t *firstc, exfat_cluster_t count) 200 200 { … … 217 217 218 218 219 int exfat_bitmap_append_clusters(exfat_bs_t *bs, exfat_node_t *nodep,219 errno_t exfat_bitmap_append_clusters(exfat_bs_t *bs, exfat_node_t *nodep, 220 220 exfat_cluster_t count) 221 221 { … … 240 240 241 241 242 int exfat_bitmap_free_clusters(exfat_bs_t *bs, exfat_node_t *nodep,242 errno_t exfat_bitmap_free_clusters(exfat_bs_t *bs, exfat_node_t *nodep, 243 243 exfat_cluster_t count) 244 244 { … … 251 251 252 252 253 int exfat_bitmap_replicate_clusters(exfat_bs_t *bs, exfat_node_t *nodep)254 { 255 int rc;253 errno_t exfat_bitmap_replicate_clusters(exfat_bs_t *bs, exfat_node_t *nodep) 254 { 255 errno_t rc; 256 256 exfat_cluster_t lastc, clst; 257 257 service_id_t service_id = nodep->idx->service_id; -
uspace/srv/fs/exfat/exfat_bitmap.h
rfacacc71 r46577995 42 42 struct exfat_bs; 43 43 44 extern int exfat_bitmap_alloc_clusters(struct exfat_bs *, service_id_t,44 extern errno_t exfat_bitmap_alloc_clusters(struct exfat_bs *, service_id_t, 45 45 exfat_cluster_t *, exfat_cluster_t); 46 extern int exfat_bitmap_append_clusters(struct exfat_bs *, struct exfat_node *,46 extern errno_t exfat_bitmap_append_clusters(struct exfat_bs *, struct exfat_node *, 47 47 exfat_cluster_t); 48 extern int exfat_bitmap_free_clusters(struct exfat_bs *, struct exfat_node *,48 extern errno_t exfat_bitmap_free_clusters(struct exfat_bs *, struct exfat_node *, 49 49 exfat_cluster_t); 50 extern int exfat_bitmap_replicate_clusters(struct exfat_bs *, struct exfat_node *);50 extern errno_t exfat_bitmap_replicate_clusters(struct exfat_bs *, struct exfat_node *); 51 51 52 extern int exfat_bitmap_is_free(struct exfat_bs *, service_id_t, exfat_cluster_t);53 extern int exfat_bitmap_set_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t);54 extern int exfat_bitmap_clear_cluster(struct exfat_bs *, service_id_t,52 extern errno_t exfat_bitmap_is_free(struct exfat_bs *, service_id_t, exfat_cluster_t); 53 extern errno_t exfat_bitmap_set_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t); 54 extern errno_t exfat_bitmap_clear_cluster(struct exfat_bs *, service_id_t, 55 55 exfat_cluster_t); 56 56 57 extern int exfat_bitmap_set_clusters(struct exfat_bs *, service_id_t,57 extern errno_t exfat_bitmap_set_clusters(struct exfat_bs *, service_id_t, 58 58 exfat_cluster_t, exfat_cluster_t); 59 extern int exfat_bitmap_clear_clusters(struct exfat_bs *, service_id_t,59 extern errno_t exfat_bitmap_clear_clusters(struct exfat_bs *, service_id_t, 60 60 exfat_cluster_t, exfat_cluster_t); 61 61 -
uspace/srv/fs/exfat/exfat_directory.c
rfacacc71 r46577995 60 60 } 61 61 62 int exfat_directory_open(exfat_node_t *nodep, exfat_directory_t *di)62 errno_t exfat_directory_open(exfat_node_t *nodep, exfat_directory_t *di) 63 63 { 64 64 exfat_directory_init(di); … … 76 76 } 77 77 78 int exfat_directory_open_parent(exfat_directory_t *di,78 errno_t exfat_directory_open_parent(exfat_directory_t *di, 79 79 service_id_t service_id, exfat_cluster_t firstc, bool fragmented) 80 80 { … … 88 88 } 89 89 90 int exfat_directory_close(exfat_directory_t *di)91 { 92 int rc = EOK;90 errno_t exfat_directory_close(exfat_directory_t *di) 91 { 92 errno_t rc = EOK; 93 93 94 94 if (di->b) { … … 100 100 } 101 101 102 static int exfat_directory_block_load(exfat_directory_t *di)102 static errno_t exfat_directory_block_load(exfat_directory_t *di) 103 103 { 104 104 uint32_t i; 105 int rc = EOK;105 errno_t rc = EOK; 106 106 107 107 i = (di->pos * sizeof(exfat_dentry_t)) / BPS(di->bs); … … 133 133 } 134 134 135 int exfat_directory_next(exfat_directory_t *di)136 { 137 int rc;135 errno_t exfat_directory_next(exfat_directory_t *di) 136 { 137 errno_t rc; 138 138 139 139 di->pos += 1; … … 145 145 } 146 146 147 int exfat_directory_prev(exfat_directory_t *di)148 { 149 int rc = EOK;147 errno_t exfat_directory_prev(exfat_directory_t *di) 148 { 149 errno_t rc = EOK; 150 150 151 151 if (di->pos > 0) { … … 161 161 } 162 162 163 int exfat_directory_seek(exfat_directory_t *di, aoff64_t pos)163 errno_t exfat_directory_seek(exfat_directory_t *di, aoff64_t pos) 164 164 { 165 165 aoff64_t _pos = di->pos; 166 int rc;166 errno_t rc; 167 167 168 168 di->pos = pos; … … 174 174 } 175 175 176 int exfat_directory_get(exfat_directory_t *di, exfat_dentry_t **d)177 { 178 int rc;176 errno_t exfat_directory_get(exfat_directory_t *di, exfat_dentry_t **d) 177 { 178 errno_t rc; 179 179 180 180 rc = exfat_directory_block_load(di); … … 187 187 } 188 188 189 int exfat_directory_find(exfat_directory_t *di, exfat_dentry_clsf_t type,189 errno_t exfat_directory_find(exfat_directory_t *di, exfat_dentry_clsf_t type, 190 190 exfat_dentry_t **d) 191 191 { … … 201 201 } 202 202 203 int203 errno_t 204 204 exfat_directory_find_continue(exfat_directory_t *di, exfat_dentry_clsf_t type, 205 205 exfat_dentry_t **d) 206 206 { 207 int rc;207 errno_t rc; 208 208 rc = exfat_directory_next(di); 209 209 if (rc != EOK) … … 213 213 214 214 215 int exfat_directory_read_file(exfat_directory_t *di, char *name, size_t size,215 errno_t exfat_directory_read_file(exfat_directory_t *di, char *name, size_t size, 216 216 exfat_file_dentry_t *df, exfat_stream_dentry_t *ds) 217 217 { 218 218 uint16_t wname[EXFAT_FILENAME_LEN + 1]; 219 219 exfat_dentry_t *d = NULL; 220 int rc;220 errno_t rc; 221 221 int i; 222 222 size_t offset = 0; … … 261 261 } 262 262 263 int exfat_directory_read_vollabel(exfat_directory_t *di, char *label,263 errno_t exfat_directory_read_vollabel(exfat_directory_t *di, char *label, 264 264 size_t size) 265 265 { 266 266 uint16_t wlabel[EXFAT_VOLLABEL_LEN + 1]; 267 267 exfat_dentry_t *d = NULL; 268 int rc;268 errno_t rc; 269 269 aoff64_t start_pos = 0; 270 270 … … 303 303 } 304 304 305 int exfat_directory_sync_file(exfat_directory_t *di, exfat_file_dentry_t *df,305 errno_t exfat_directory_sync_file(exfat_directory_t *di, exfat_file_dentry_t *df, 306 306 exfat_stream_dentry_t *ds) 307 307 { 308 int rc;308 errno_t rc; 309 309 int i, count; 310 310 exfat_dentry_t *array = NULL, *de; … … 367 367 } 368 368 369 int exfat_directory_write_file(exfat_directory_t *di, const char *name)369 errno_t exfat_directory_write_file(exfat_directory_t *di, const char *name) 370 370 { 371 371 fs_node_t *fn; … … 374 374 exfat_dentry_t df, ds, *de; 375 375 uint16_t wname[EXFAT_FILENAME_LEN + 1]; 376 int rc;376 errno_t rc; 377 377 int i; 378 378 size_t uctable_chars, j; … … 474 474 } 475 475 476 int exfat_directory_erase_file(exfat_directory_t *di, aoff64_t pos)477 { 478 int rc;476 errno_t exfat_directory_erase_file(exfat_directory_t *di, aoff64_t pos) 477 { 478 errno_t rc; 479 479 int count; 480 480 exfat_dentry_t *de; … … 502 502 } 503 503 504 int exfat_directory_expand(exfat_directory_t *di)505 { 506 int rc;504 errno_t exfat_directory_expand(exfat_directory_t *di) 505 { 506 errno_t rc; 507 507 508 508 if (!di->nodep) … … 521 521 } 522 522 523 int exfat_directory_lookup_free(exfat_directory_t *di, size_t count)524 { 525 int rc;523 errno_t exfat_directory_lookup_free(exfat_directory_t *di, size_t count) 524 { 525 errno_t rc; 526 526 exfat_dentry_t *d; 527 527 size_t found; -
uspace/srv/fs/exfat/exfat_directory.h
rfacacc71 r46577995 55 55 56 56 extern void exfat_directory_init(exfat_directory_t *); 57 extern int exfat_directory_open(exfat_node_t *, exfat_directory_t *);58 extern int exfat_directory_open_parent(exfat_directory_t *, service_id_t,57 extern errno_t exfat_directory_open(exfat_node_t *, exfat_directory_t *); 58 extern errno_t exfat_directory_open_parent(exfat_directory_t *, service_id_t, 59 59 exfat_cluster_t, bool); 60 extern int exfat_directory_close(exfat_directory_t *);60 extern errno_t exfat_directory_close(exfat_directory_t *); 61 61 62 extern int exfat_directory_next(exfat_directory_t *);63 extern int exfat_directory_prev(exfat_directory_t *);64 extern int exfat_directory_seek(exfat_directory_t *, aoff64_t);65 extern int exfat_directory_get(exfat_directory_t *, exfat_dentry_t **);66 extern int exfat_directory_find(exfat_directory_t *, exfat_dentry_clsf_t,62 extern errno_t exfat_directory_next(exfat_directory_t *); 63 extern errno_t exfat_directory_prev(exfat_directory_t *); 64 extern errno_t exfat_directory_seek(exfat_directory_t *, aoff64_t); 65 extern errno_t exfat_directory_get(exfat_directory_t *, exfat_dentry_t **); 66 extern errno_t exfat_directory_find(exfat_directory_t *, exfat_dentry_clsf_t, 67 67 exfat_dentry_t **); 68 extern int exfat_directory_find_continue(exfat_directory_t *,68 extern errno_t exfat_directory_find_continue(exfat_directory_t *, 69 69 exfat_dentry_clsf_t, exfat_dentry_t **); 70 70 71 extern int exfat_directory_read_file(exfat_directory_t *, char *, size_t,71 extern errno_t exfat_directory_read_file(exfat_directory_t *, char *, size_t, 72 72 exfat_file_dentry_t *, exfat_stream_dentry_t *); 73 extern int exfat_directory_read_vollabel(exfat_directory_t *, char *, size_t);74 extern int exfat_directory_sync_file(exfat_directory_t *, exfat_file_dentry_t *,73 extern errno_t exfat_directory_read_vollabel(exfat_directory_t *, char *, size_t); 74 extern errno_t exfat_directory_sync_file(exfat_directory_t *, exfat_file_dentry_t *, 75 75 exfat_stream_dentry_t *); 76 extern int exfat_directory_write_file(exfat_directory_t *, const char *);77 extern int exfat_directory_erase_file(exfat_directory_t *, aoff64_t);76 extern errno_t exfat_directory_write_file(exfat_directory_t *, const char *); 77 extern errno_t exfat_directory_erase_file(exfat_directory_t *, aoff64_t); 78 78 79 79 80 extern int exfat_directory_expand(exfat_directory_t *);81 extern int exfat_directory_lookup_free(exfat_directory_t *, size_t);82 extern int exfat_directory_print(exfat_directory_t *);80 extern errno_t exfat_directory_expand(exfat_directory_t *); 81 extern errno_t exfat_directory_lookup_free(exfat_directory_t *, size_t); 82 extern errno_t exfat_directory_print(exfat_directory_t *); 83 83 84 84 -
uspace/srv/fs/exfat/exfat_fat.c
rfacacc71 r46577995 73 73 * @return EOK on success or an error code. 74 74 */ 75 int75 errno_t 76 76 exfat_cluster_walk(exfat_bs_t *bs, service_id_t service_id, 77 77 exfat_cluster_t firstc, exfat_cluster_t *lastc, uint32_t *numc, … … 80 80 uint32_t clusters = 0; 81 81 exfat_cluster_t clst = firstc; 82 int rc;82 errno_t rc; 83 83 84 84 if (firstc < EXFAT_CLST_FIRST) { … … 122 122 * @return EOK on success or an error code. 123 123 */ 124 int124 errno_t 125 125 exfat_block_get(block_t **block, exfat_bs_t *bs, exfat_node_t *nodep, 126 126 aoff64_t bn, int flags) … … 129 129 exfat_cluster_t currc = 0; 130 130 aoff64_t relbn = bn; 131 int rc;131 errno_t rc; 132 132 133 133 if (!nodep->size) … … 186 186 * @return EOK on success or an error code. 187 187 */ 188 int188 errno_t 189 189 exfat_block_get_by_clst(block_t **block, exfat_bs_t *bs, 190 190 service_id_t service_id, bool fragmented, exfat_cluster_t fcl, … … 194 194 uint32_t max_clusters; 195 195 exfat_cluster_t c = EXFAT_CLST_FIRST; 196 int rc;196 errno_t rc; 197 197 198 198 if (fcl < EXFAT_CLST_FIRST || fcl > DATA_CNT(bs) + 2) … … 229 229 * @return EOK or an error code. 230 230 */ 231 int231 errno_t 232 232 exfat_get_cluster(exfat_bs_t *bs, service_id_t service_id, 233 233 exfat_cluster_t clst, exfat_cluster_t *value) … … 235 235 block_t *b; 236 236 aoff64_t offset; 237 int rc;237 errno_t rc; 238 238 239 239 offset = clst * sizeof(exfat_cluster_t); … … 259 259 * @return EOK on success or an error code. 260 260 */ 261 int261 errno_t 262 262 exfat_set_cluster(exfat_bs_t *bs, service_id_t service_id, 263 263 exfat_cluster_t clst, exfat_cluster_t value) … … 265 265 block_t *b; 266 266 aoff64_t offset; 267 int rc;267 errno_t rc; 268 268 269 269 offset = clst * sizeof(exfat_cluster_t); … … 297 297 * @return EOK on success, an error code otherwise. 298 298 */ 299 int299 errno_t 300 300 exfat_alloc_clusters(exfat_bs_t *bs, service_id_t service_id, unsigned nclsts, 301 301 exfat_cluster_t *mcl, exfat_cluster_t *lcl) … … 304 304 unsigned found = 0; /* top of the free cluster number stack */ 305 305 exfat_cluster_t clst; 306 int rc = EOK;306 errno_t rc = EOK; 307 307 308 308 lifo = (exfat_cluster_t *) malloc(nclsts * sizeof(exfat_cluster_t)); … … 363 363 * @return EOK on success or an error code. 364 364 */ 365 int365 errno_t 366 366 exfat_free_clusters(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t firstc) 367 367 { 368 368 exfat_cluster_t nextc; 369 int rc;369 errno_t rc; 370 370 371 371 /* Mark all clusters in the chain as free */ … … 396 396 * @return EOK on success or an error code. 397 397 */ 398 int398 errno_t 399 399 exfat_append_clusters(exfat_bs_t *bs, exfat_node_t *nodep, exfat_cluster_t mcl, 400 400 exfat_cluster_t lcl) … … 402 402 service_id_t service_id = nodep->idx->service_id; 403 403 exfat_cluster_t lastc = 0; 404 int rc;404 errno_t rc; 405 405 406 406 if (nodep->firstc == 0) { … … 440 440 * @return EOK on success or an error code. 441 441 */ 442 int exfat_chop_clusters(exfat_bs_t *bs, exfat_node_t *nodep, exfat_cluster_t lcl)443 { 444 int rc;442 errno_t exfat_chop_clusters(exfat_bs_t *bs, exfat_node_t *nodep, exfat_cluster_t lcl) 443 { 444 errno_t rc; 445 445 service_id_t service_id = nodep->idx->service_id; 446 446 … … 486 486 } 487 487 488 int488 errno_t 489 489 exfat_zero_cluster(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t c) 490 490 { 491 491 size_t i; 492 492 block_t *b; 493 int rc;493 errno_t rc; 494 494 495 495 for (i = 0; i < SPC(bs); i++) { … … 508 508 } 509 509 510 int510 errno_t 511 511 exfat_read_uctable(exfat_bs_t *bs, exfat_node_t *nodep, uint8_t *uctable) 512 512 { 513 513 size_t i, blocks, count; 514 514 block_t *b; 515 int rc;515 errno_t rc; 516 516 blocks = ROUND_UP(nodep->size, BPS(bs))/BPS(bs); 517 517 count = BPS(bs); … … 540 540 * does not contain a exfat file system. 541 541 */ 542 int exfat_sanity_check(exfat_bs_t *bs)542 errno_t exfat_sanity_check(exfat_bs_t *bs) 543 543 { 544 544 if (str_cmp((char const *)bs->oem_name, "EXFAT ")) -
uspace/srv/fs/exfat/exfat_fat.h
rfacacc71 r46577995 61 61 exfat_cluster_walk((bs), (sid), (fc), NULL, (numc), (uint32_t) -1) 62 62 63 extern int exfat_cluster_walk(struct exfat_bs *, service_id_t,63 extern errno_t exfat_cluster_walk(struct exfat_bs *, service_id_t, 64 64 exfat_cluster_t, exfat_cluster_t *, uint32_t *, uint32_t); 65 extern int exfat_block_get(block_t **, struct exfat_bs *, struct exfat_node *,65 extern errno_t exfat_block_get(block_t **, struct exfat_bs *, struct exfat_node *, 66 66 aoff64_t, int); 67 extern int exfat_block_get_by_clst(block_t **, struct exfat_bs *, service_id_t,67 extern errno_t exfat_block_get_by_clst(block_t **, struct exfat_bs *, service_id_t, 68 68 bool, exfat_cluster_t, exfat_cluster_t *, aoff64_t, int); 69 69 70 extern int exfat_get_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t,70 extern errno_t exfat_get_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t, 71 71 exfat_cluster_t *); 72 extern int exfat_set_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t,72 extern errno_t exfat_set_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t, 73 73 exfat_cluster_t); 74 extern int exfat_sanity_check(struct exfat_bs *);74 extern errno_t exfat_sanity_check(struct exfat_bs *); 75 75 76 extern int exfat_append_clusters(struct exfat_bs *, struct exfat_node *,76 extern errno_t exfat_append_clusters(struct exfat_bs *, struct exfat_node *, 77 77 exfat_cluster_t, exfat_cluster_t); 78 extern int exfat_chop_clusters(struct exfat_bs *, struct exfat_node *,78 extern errno_t exfat_chop_clusters(struct exfat_bs *, struct exfat_node *, 79 79 exfat_cluster_t); 80 extern int exfat_alloc_clusters(struct exfat_bs *, service_id_t, unsigned,80 extern errno_t exfat_alloc_clusters(struct exfat_bs *, service_id_t, unsigned, 81 81 exfat_cluster_t *, exfat_cluster_t *); 82 extern int exfat_free_clusters(struct exfat_bs *, service_id_t, exfat_cluster_t);83 extern int exfat_zero_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t);82 extern errno_t exfat_free_clusters(struct exfat_bs *, service_id_t, exfat_cluster_t); 83 extern errno_t exfat_zero_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t); 84 84 85 extern int exfat_read_uctable(struct exfat_bs *, struct exfat_node *,85 extern errno_t exfat_read_uctable(struct exfat_bs *, struct exfat_node *, 86 86 uint8_t *); 87 87 -
uspace/srv/fs/exfat/exfat_idx.c
rfacacc71 r46577995 328 328 } 329 329 330 static int exfat_idx_create(exfat_idx_t **fidxp, service_id_t service_id)330 static errno_t exfat_idx_create(exfat_idx_t **fidxp, service_id_t service_id) 331 331 { 332 332 exfat_idx_t *fidx; … … 350 350 } 351 351 352 int exfat_idx_get_new(exfat_idx_t **fidxp, service_id_t service_id)352 errno_t exfat_idx_get_new(exfat_idx_t **fidxp, service_id_t service_id) 353 353 { 354 354 exfat_idx_t *fidx; 355 int rc;355 errno_t rc; 356 356 357 357 fibril_mutex_lock(&used_lock); … … 386 386 fidx = hash_table_get_inst(l, exfat_idx_t, uph_link); 387 387 } else { 388 int rc;388 errno_t rc; 389 389 390 390 rc = exfat_idx_create(&fidx, service_id); … … 468 468 } 469 469 470 int exfat_idx_init(void)470 errno_t exfat_idx_init(void) 471 471 { 472 472 if (!hash_table_create(&up_hash, 0, 0, &uph_ops)) … … 487 487 } 488 488 489 int exfat_idx_init_by_service_id(service_id_t service_id)489 errno_t exfat_idx_init_by_service_id(service_id_t service_id) 490 490 { 491 491 unused_t *u; 492 int rc = EOK;492 errno_t rc = EOK; 493 493 494 494 u = (unused_t *) malloc(sizeof(unused_t)); -
uspace/srv/fs/exfat/exfat_ops.c
rfacacc71 r46577995 72 72 */ 73 73 74 static int exfat_root_get(fs_node_t **, service_id_t);75 static int exfat_match(fs_node_t **, fs_node_t *, const char *);76 static int exfat_node_get(fs_node_t **, service_id_t, fs_index_t);77 static int exfat_node_open(fs_node_t *);78 /* static int exfat_node_put(fs_node_t *); */79 static int exfat_create_node(fs_node_t **, service_id_t, int);80 static int exfat_destroy_node(fs_node_t *);81 static int exfat_link(fs_node_t *, fs_node_t *, const char *);82 static int exfat_unlink(fs_node_t *, fs_node_t *, const char *);83 static int exfat_has_children(bool *, fs_node_t *);74 static errno_t exfat_root_get(fs_node_t **, service_id_t); 75 static errno_t exfat_match(fs_node_t **, fs_node_t *, const char *); 76 static errno_t exfat_node_get(fs_node_t **, service_id_t, fs_index_t); 77 static errno_t exfat_node_open(fs_node_t *); 78 /* static errno_t exfat_node_put(fs_node_t *); */ 79 static errno_t exfat_create_node(fs_node_t **, service_id_t, int); 80 static errno_t exfat_destroy_node(fs_node_t *); 81 static errno_t exfat_link(fs_node_t *, fs_node_t *, const char *); 82 static errno_t exfat_unlink(fs_node_t *, fs_node_t *, const char *); 83 static errno_t exfat_has_children(bool *, fs_node_t *); 84 84 static fs_index_t exfat_index_get(fs_node_t *); 85 85 static aoff64_t exfat_size_get(fs_node_t *); … … 88 88 static bool exfat_is_file(fs_node_t *node); 89 89 static service_id_t exfat_service_get(fs_node_t *node); 90 static int exfat_size_block(service_id_t, uint32_t *);91 static int exfat_total_block_count(service_id_t, uint64_t *);92 static int exfat_free_block_count(service_id_t, uint64_t *);90 static errno_t exfat_size_block(service_id_t, uint32_t *); 91 static errno_t exfat_total_block_count(service_id_t, uint64_t *); 92 static errno_t exfat_free_block_count(service_id_t, uint64_t *); 93 93 94 94 /* … … 114 114 } 115 115 116 static int exfat_node_sync(exfat_node_t *node)117 { 118 int rc;116 static errno_t exfat_node_sync(exfat_node_t *node) 117 { 118 errno_t rc; 119 119 exfat_directory_t di; 120 120 exfat_file_dentry_t df; … … 155 155 } 156 156 157 static int exfat_node_fini_by_service_id(service_id_t service_id)158 { 159 int rc;157 static errno_t exfat_node_fini_by_service_id(service_id_t service_id) 158 { 159 errno_t rc; 160 160 161 161 /* … … 211 211 } 212 212 213 static int exfat_node_get_new(exfat_node_t **nodepp)213 static errno_t exfat_node_get_new(exfat_node_t **nodepp) 214 214 { 215 215 fs_node_t *fn; 216 216 exfat_node_t *nodep; 217 int rc;217 errno_t rc; 218 218 219 219 fibril_mutex_lock(&ffn_mutex); … … 269 269 } 270 270 271 static int exfat_node_get_new_by_pos(exfat_node_t **nodepp,271 static errno_t exfat_node_get_new_by_pos(exfat_node_t **nodepp, 272 272 service_id_t service_id, exfat_cluster_t pfc, unsigned pdi) 273 273 { … … 287 287 * @param idxp Locked index structure. 288 288 */ 289 static int exfat_node_get_core(exfat_node_t **nodepp, exfat_idx_t *idxp)289 static errno_t exfat_node_get_core(exfat_node_t **nodepp, exfat_idx_t *idxp) 290 290 { 291 291 exfat_dentry_t *d; 292 292 exfat_node_t *nodep = NULL; 293 293 exfat_directory_t di; 294 int rc;294 errno_t rc; 295 295 296 296 if (idxp->nodep) { … … 398 398 } 399 399 400 int exfat_node_expand(service_id_t service_id, exfat_node_t *nodep,400 errno_t exfat_node_expand(service_id_t service_id, exfat_node_t *nodep, 401 401 exfat_cluster_t clusters) 402 402 { 403 403 exfat_bs_t *bs; 404 int rc;404 errno_t rc; 405 405 bs = block_bb_get(service_id); 406 406 … … 443 443 } 444 444 445 static int exfat_node_shrink(service_id_t service_id, exfat_node_t *nodep,445 static errno_t exfat_node_shrink(service_id_t service_id, exfat_node_t *nodep, 446 446 aoff64_t size) 447 447 { 448 448 exfat_bs_t *bs; 449 int rc;449 errno_t rc; 450 450 bs = block_bb_get(service_id); 451 451 … … 491 491 */ 492 492 493 int exfat_root_get(fs_node_t **rfn, service_id_t service_id)493 errno_t exfat_root_get(fs_node_t **rfn, service_id_t service_id) 494 494 { 495 495 return exfat_node_get(rfn, service_id, EXFAT_ROOT_IDX); 496 496 } 497 497 498 int exfat_bitmap_get(fs_node_t **rfn, service_id_t service_id)498 errno_t exfat_bitmap_get(fs_node_t **rfn, service_id_t service_id) 499 499 { 500 500 return exfat_node_get(rfn, service_id, EXFAT_BITMAP_IDX); 501 501 } 502 502 503 int exfat_uctable_get(fs_node_t **rfn, service_id_t service_id)503 errno_t exfat_uctable_get(fs_node_t **rfn, service_id_t service_id) 504 504 { 505 505 return exfat_node_get(rfn, service_id, EXFAT_UCTABLE_IDX); … … 507 507 508 508 509 int exfat_match(fs_node_t **rfn, fs_node_t *pfn, const char *component)509 errno_t exfat_match(fs_node_t **rfn, fs_node_t *pfn, const char *component) 510 510 { 511 511 exfat_node_t *parentp = EXFAT_NODE(pfn); … … 514 514 exfat_stream_dentry_t ds; 515 515 service_id_t service_id; 516 int rc;516 errno_t rc; 517 517 518 518 fibril_mutex_lock(&parentp->idx->lock); … … 565 565 566 566 /** Instantiate a exFAT in-core node. */ 567 int exfat_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index)567 errno_t exfat_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index) 568 568 { 569 569 exfat_node_t *nodep; 570 570 exfat_idx_t *idxp; 571 int rc;571 errno_t rc; 572 572 573 573 idxp = exfat_idx_get_by_index(service_id, index); … … 584 584 } 585 585 586 int exfat_node_open(fs_node_t *fn)586 errno_t exfat_node_open(fs_node_t *fn) 587 587 { 588 588 /* … … 593 593 } 594 594 595 int exfat_node_put(fs_node_t *fn)595 errno_t exfat_node_put(fs_node_t *fn) 596 596 { 597 597 if (fn == NULL) … … 625 625 } 626 626 627 int exfat_create_node(fs_node_t **rfn, service_id_t service_id, int flags)627 errno_t exfat_create_node(fs_node_t **rfn, service_id_t service_id, int flags) 628 628 { 629 629 exfat_idx_t *idxp; 630 630 exfat_node_t *nodep; 631 631 exfat_bs_t *bs; 632 int rc;632 errno_t rc; 633 633 634 634 bs = block_bb_get(service_id); … … 677 677 } 678 678 679 int exfat_destroy_node(fs_node_t *fn)679 errno_t exfat_destroy_node(fs_node_t *fn) 680 680 { 681 681 exfat_node_t *nodep = EXFAT_NODE(fn); 682 682 exfat_bs_t *bs; 683 683 bool has_children; 684 int rc;684 errno_t rc; 685 685 686 686 /* … … 718 718 } 719 719 720 int exfat_link(fs_node_t *pfn, fs_node_t *cfn, const char *name)720 errno_t exfat_link(fs_node_t *pfn, fs_node_t *cfn, const char *name) 721 721 { 722 722 exfat_node_t *parentp = EXFAT_NODE(pfn); 723 723 exfat_node_t *childp = EXFAT_NODE(cfn); 724 724 exfat_directory_t di; 725 int rc;725 errno_t rc; 726 726 727 727 fibril_mutex_lock(&childp->lock); … … 783 783 } 784 784 785 int exfat_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *nm)785 errno_t exfat_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *nm) 786 786 { 787 787 exfat_node_t *parentp = EXFAT_NODE(pfn); 788 788 exfat_node_t *childp = EXFAT_NODE(cfn); 789 789 bool has_children; 790 int rc;790 errno_t rc; 791 791 792 792 if (!parentp) … … 838 838 } 839 839 840 int exfat_has_children(bool *has_children, fs_node_t *fn)840 errno_t exfat_has_children(bool *has_children, fs_node_t *fn) 841 841 { 842 842 exfat_directory_t di; 843 843 exfat_dentry_t *d; 844 844 exfat_node_t *nodep = EXFAT_NODE(fn); 845 int rc;845 errno_t rc; 846 846 847 847 *has_children = false; … … 915 915 } 916 916 917 int exfat_size_block(service_id_t service_id, uint32_t *size)917 errno_t exfat_size_block(service_id_t service_id, uint32_t *size) 918 918 { 919 919 exfat_bs_t *bs; … … 924 924 } 925 925 926 int exfat_total_block_count(service_id_t service_id, uint64_t *count)926 errno_t exfat_total_block_count(service_id_t service_id, uint64_t *count) 927 927 { 928 928 exfat_bs_t *bs; … … 933 933 } 934 934 935 int exfat_free_block_count(service_id_t service_id, uint64_t *count)935 errno_t exfat_free_block_count(service_id_t service_id, uint64_t *count) 936 936 { 937 937 fs_node_t *node = NULL; … … 941 941 uint64_t block_count; 942 942 unsigned sector; 943 int rc;943 errno_t rc; 944 944 945 945 rc = exfat_total_block_count(service_id, &block_count); … … 1015 1015 }; 1016 1016 1017 static int exfat_fs_open(service_id_t service_id, enum cache_mode cmode,1017 static errno_t exfat_fs_open(service_id_t service_id, enum cache_mode cmode, 1018 1018 fs_node_t **rrfn, exfat_idx_t **rridxp, vfs_fs_probe_info_t *info) 1019 1019 { 1020 int rc;1020 errno_t rc; 1021 1021 exfat_node_t *rootp = NULL, *bitmapp = NULL, *uctablep = NULL; 1022 1022 exfat_bs_t *bs; … … 1267 1267 */ 1268 1268 1269 static int exfat_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)1270 { 1271 int rc;1269 static errno_t exfat_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info) 1270 { 1271 errno_t rc; 1272 1272 exfat_idx_t *ridxp; 1273 1273 fs_node_t *rfn; … … 1281 1281 } 1282 1282 1283 static int1283 static errno_t 1284 1284 exfat_mounted(service_id_t service_id, const char *opts, fs_index_t *index, 1285 1285 aoff64_t *size) 1286 1286 { 1287 int rc;1287 errno_t rc; 1288 1288 enum cache_mode cmode; 1289 1289 exfat_idx_t *ridxp; … … 1306 1306 } 1307 1307 1308 static int exfat_unmounted(service_id_t service_id)1308 static errno_t exfat_unmounted(service_id_t service_id) 1309 1309 { 1310 1310 fs_node_t *rfn; 1311 int rc;1311 errno_t rc; 1312 1312 1313 1313 rc = exfat_root_get(&rfn, service_id); … … 1319 1319 } 1320 1320 1321 static int1321 static errno_t 1322 1322 exfat_read(service_id_t service_id, fs_index_t index, aoff64_t pos, 1323 1323 size_t *rbytes) … … 1328 1328 size_t bytes = 0; 1329 1329 block_t *b; 1330 int rc;1330 errno_t rc; 1331 1331 1332 1332 rc = exfat_node_get(&fn, service_id, index); … … 1438 1438 } 1439 1439 1440 static int exfat_close(service_id_t service_id, fs_index_t index)1441 { 1442 return EOK; 1443 } 1444 1445 static int exfat_sync(service_id_t service_id, fs_index_t index)1440 static errno_t exfat_close(service_id_t service_id, fs_index_t index) 1441 { 1442 return EOK; 1443 } 1444 1445 static errno_t exfat_sync(service_id_t service_id, fs_index_t index) 1446 1446 { 1447 1447 fs_node_t *fn; 1448 int rc = exfat_node_get(&fn, service_id, index);1448 errno_t rc = exfat_node_get(&fn, service_id, index); 1449 1449 if (rc != EOK) 1450 1450 return rc; … … 1461 1461 } 1462 1462 1463 static int1463 static errno_t 1464 1464 exfat_write(service_id_t service_id, fs_index_t index, aoff64_t pos, 1465 1465 size_t *wbytes, aoff64_t *nsize) … … 1472 1472 aoff64_t boundary; 1473 1473 int flags = BLOCK_FLAGS_NONE; 1474 int rc;1474 errno_t rc; 1475 1475 1476 1476 rc = exfat_node_get(&fn, service_id, index); … … 1548 1548 } 1549 1549 1550 static int1550 static errno_t 1551 1551 exfat_truncate(service_id_t service_id, fs_index_t index, aoff64_t size) 1552 1552 { … … 1554 1554 exfat_node_t *nodep; 1555 1555 exfat_bs_t *bs; 1556 int rc;1556 errno_t rc; 1557 1557 1558 1558 rc = exfat_node_get(&fn, service_id, index); … … 1584 1584 } 1585 1585 1586 int rc2 = exfat_node_put(fn);1586 errno_t rc2 = exfat_node_put(fn); 1587 1587 if (rc == EOK && rc2 != EOK) 1588 1588 rc = rc2; … … 1591 1591 } 1592 1592 1593 static int exfat_destroy(service_id_t service_id, fs_index_t index)1593 static errno_t exfat_destroy(service_id_t service_id, fs_index_t index) 1594 1594 { 1595 1595 fs_node_t *fn; 1596 1596 exfat_node_t *nodep; 1597 int rc;1597 errno_t rc; 1598 1598 1599 1599 rc = exfat_node_get(&fn, service_id, index); -
uspace/srv/fs/ext4fs/ext4fs.c
rfacacc71 r46577995 73 73 } 74 74 75 int rc = ext4_global_init();75 errno_t rc = ext4_global_init(); 76 76 if (rc != EOK) { 77 77 printf("%s: Global initialization failed\n", NAME); -
uspace/srv/fs/fat/fat.c
rfacacc71 r46577995 72 72 } 73 73 74 int rc = fat_idx_init();74 errno_t rc = fat_idx_init(); 75 75 if (rc != EOK) 76 76 goto err; -
uspace/srv/fs/fat/fat.h
rfacacc71 r46577995 250 250 extern libfs_ops_t fat_libfs_ops; 251 251 252 extern int fat_idx_get_new(fat_idx_t **, service_id_t);252 extern errno_t fat_idx_get_new(fat_idx_t **, service_id_t); 253 253 extern fat_idx_t *fat_idx_get_by_pos(service_id_t, fat_cluster_t, unsigned); 254 254 extern fat_idx_t *fat_idx_get_by_index(service_id_t, fs_index_t); … … 257 257 extern void fat_idx_hashout(fat_idx_t *); 258 258 259 extern int fat_idx_init(void);259 extern errno_t fat_idx_init(void); 260 260 extern void fat_idx_fini(void); 261 extern int fat_idx_init_by_service_id(service_id_t);261 extern errno_t fat_idx_init_by_service_id(service_id_t); 262 262 extern void fat_idx_fini_by_service_id(service_id_t); 263 263 -
uspace/srv/fs/fat/fat_directory.c
rfacacc71 r46577995 46 46 #include <stdio.h> 47 47 48 int fat_directory_open(fat_node_t *nodep, fat_directory_t *di)48 errno_t fat_directory_open(fat_node_t *nodep, fat_directory_t *di) 49 49 { 50 50 di->b = NULL; … … 62 62 } 63 63 64 int fat_directory_close(fat_directory_t *di)65 { 66 int rc = EOK;64 errno_t fat_directory_close(fat_directory_t *di) 65 { 66 errno_t rc = EOK; 67 67 68 68 if (di->b) … … 72 72 } 73 73 74 static int fat_directory_block_load(fat_directory_t *di)74 static errno_t fat_directory_block_load(fat_directory_t *di) 75 75 { 76 76 uint32_t i; 77 int rc;77 errno_t rc; 78 78 79 79 i = (di->pos * sizeof(fat_dentry_t)) / BPS(di->bs); … … 98 98 } 99 99 100 int fat_directory_next(fat_directory_t *di)101 { 102 int rc;100 errno_t fat_directory_next(fat_directory_t *di) 101 { 102 errno_t rc; 103 103 104 104 di->pos += 1; … … 110 110 } 111 111 112 int fat_directory_prev(fat_directory_t *di)113 { 114 int rc = EOK;112 errno_t fat_directory_prev(fat_directory_t *di) 113 { 114 errno_t rc = EOK; 115 115 116 116 if (di->pos > 0) { … … 126 126 } 127 127 128 int fat_directory_seek(fat_directory_t *di, aoff64_t pos)128 errno_t fat_directory_seek(fat_directory_t *di, aoff64_t pos) 129 129 { 130 130 aoff64_t _pos = di->pos; 131 int rc;131 errno_t rc; 132 132 133 133 di->pos = pos; … … 139 139 } 140 140 141 int fat_directory_get(fat_directory_t *di, fat_dentry_t **d)142 { 143 int rc;141 errno_t fat_directory_get(fat_directory_t *di, fat_dentry_t **d) 142 { 143 errno_t rc; 144 144 145 145 rc = fat_directory_block_load(di); … … 152 152 } 153 153 154 int fat_directory_read(fat_directory_t *di, char *name, fat_dentry_t **de)154 errno_t fat_directory_read(fat_directory_t *di, char *name, fat_dentry_t **de) 155 155 { 156 156 fat_dentry_t *d = NULL; … … 160 160 int long_entry_count = 0; 161 161 uint8_t checksum = 0; 162 int rc;162 errno_t rc; 163 163 164 164 void *data; … … 236 236 } 237 237 238 int fat_directory_erase(fat_directory_t *di)239 { 240 int rc;238 errno_t fat_directory_erase(fat_directory_t *di) 239 { 240 errno_t rc; 241 241 fat_dentry_t *d; 242 242 bool flag = false; … … 267 267 } 268 268 269 int fat_directory_write(fat_directory_t *di, const char *name, fat_dentry_t *de)270 { 271 int rc;269 errno_t fat_directory_write(fat_directory_t *di, const char *name, fat_dentry_t *de) 270 { 271 errno_t rc; 272 272 void *data; 273 273 fat_instance_t *instance; … … 348 348 } 349 349 350 int fat_directory_create_sfn(fat_directory_t *di, fat_dentry_t *de,350 errno_t fat_directory_create_sfn(fat_directory_t *di, fat_dentry_t *de, 351 351 const char *lname) 352 352 { … … 398 398 } 399 399 400 int fat_directory_write_dentry(fat_directory_t *di, fat_dentry_t *de)400 errno_t fat_directory_write_dentry(fat_directory_t *di, fat_dentry_t *de) 401 401 { 402 402 fat_dentry_t *d; 403 int rc;403 errno_t rc; 404 404 405 405 rc = fat_directory_get(di, &d); … … 412 412 } 413 413 414 int fat_directory_expand(fat_directory_t *di)415 { 416 int rc;414 errno_t fat_directory_expand(fat_directory_t *di) 415 { 416 errno_t rc; 417 417 fat_cluster_t mcl, lcl; 418 418 … … 444 444 } 445 445 446 int fat_directory_lookup_free(fat_directory_t *di, size_t count)446 errno_t fat_directory_lookup_free(fat_directory_t *di, size_t count) 447 447 { 448 448 fat_dentry_t *d; 449 449 size_t found; 450 450 aoff64_t pos; 451 int rc;451 errno_t rc; 452 452 453 453 do { … … 485 485 } 486 486 487 int fat_directory_lookup_name(fat_directory_t *di, const char *name,487 errno_t fat_directory_lookup_name(fat_directory_t *di, const char *name, 488 488 fat_dentry_t **de) 489 489 { … … 506 506 { 507 507 fat_dentry_t *d; 508 int rc;508 errno_t rc; 509 509 510 510 fat_directory_seek(di, 0); … … 538 538 * @return EOK on success, ENOENT if not found, EIO on I/O error 539 539 */ 540 int fat_directory_vollabel_get(fat_directory_t *di, char *label)540 errno_t fat_directory_vollabel_get(fat_directory_t *di, char *label) 541 541 { 542 542 fat_dentry_t *d; 543 int rc;543 errno_t rc; 544 544 545 545 fat_directory_seek(di, 0); -
uspace/srv/fs/fat/fat_directory.h
rfacacc71 r46577995 52 52 53 53 54 extern int fat_directory_open(fat_node_t *, fat_directory_t *);55 extern int fat_directory_close(fat_directory_t *);54 extern errno_t fat_directory_open(fat_node_t *, fat_directory_t *); 55 extern errno_t fat_directory_close(fat_directory_t *); 56 56 57 extern int fat_directory_next(fat_directory_t *);58 extern int fat_directory_prev(fat_directory_t *);59 extern int fat_directory_seek(fat_directory_t *, aoff64_t);60 extern int fat_directory_get(fat_directory_t *, fat_dentry_t **);57 extern errno_t fat_directory_next(fat_directory_t *); 58 extern errno_t fat_directory_prev(fat_directory_t *); 59 extern errno_t fat_directory_seek(fat_directory_t *, aoff64_t); 60 extern errno_t fat_directory_get(fat_directory_t *, fat_dentry_t **); 61 61 62 extern int fat_directory_read(fat_directory_t *, char *, fat_dentry_t **);63 extern int fat_directory_write(fat_directory_t *, const char *, fat_dentry_t *);64 extern int fat_directory_erase(fat_directory_t *);65 extern int fat_directory_lookup_name(fat_directory_t *, const char *,62 extern errno_t fat_directory_read(fat_directory_t *, char *, fat_dentry_t **); 63 extern errno_t fat_directory_write(fat_directory_t *, const char *, fat_dentry_t *); 64 extern errno_t fat_directory_erase(fat_directory_t *); 65 extern errno_t fat_directory_lookup_name(fat_directory_t *, const char *, 66 66 fat_dentry_t **); 67 67 extern bool fat_directory_is_sfn_exist(fat_directory_t *, fat_dentry_t *); 68 68 69 extern int fat_directory_lookup_free(fat_directory_t *, size_t);70 extern int fat_directory_write_dentry(fat_directory_t *, fat_dentry_t *);71 extern int fat_directory_create_sfn(fat_directory_t *, fat_dentry_t *,69 extern errno_t fat_directory_lookup_free(fat_directory_t *, size_t); 70 extern errno_t fat_directory_write_dentry(fat_directory_t *, fat_dentry_t *); 71 extern errno_t fat_directory_create_sfn(fat_directory_t *, fat_dentry_t *, 72 72 const char *); 73 extern int fat_directory_expand(fat_directory_t *);74 extern int fat_directory_vollabel_get(fat_directory_t *, char *);73 extern errno_t fat_directory_expand(fat_directory_t *); 74 extern errno_t fat_directory_vollabel_get(fat_directory_t *, char *); 75 75 76 76 #endif -
uspace/srv/fs/fat/fat_fat.c
rfacacc71 r46577995 73 73 * @return EOK on success or an error code. 74 74 */ 75 int75 errno_t 76 76 fat_cluster_walk(fat_bs_t *bs, service_id_t service_id, fat_cluster_t firstc, 77 77 fat_cluster_t *lastc, uint32_t *numc, uint32_t max_clusters) … … 80 80 fat_cluster_t clst = firstc, clst_last1 = FAT_CLST_LAST1(bs); 81 81 fat_cluster_t clst_bad = FAT_CLST_BAD(bs); 82 int rc;82 errno_t rc; 83 83 84 84 if (firstc == FAT_CLST_RES0) { … … 123 123 * @return EOK on success or an error code. 124 124 */ 125 int125 errno_t 126 126 fat_block_get(block_t **block, struct fat_bs *bs, fat_node_t *nodep, 127 127 aoff64_t bn, int flags) … … 130 130 fat_cluster_t currc = 0; 131 131 aoff64_t relbn = bn; 132 int rc;132 errno_t rc; 133 133 134 134 if (!nodep->size) … … 188 188 * @return EOK on success or an error code. 189 189 */ 190 int190 errno_t 191 191 _fat_block_get(block_t **block, fat_bs_t *bs, service_id_t service_id, 192 192 fat_cluster_t fcl, fat_cluster_t *clp, aoff64_t bn, int flags) … … 195 195 uint32_t max_clusters; 196 196 fat_cluster_t c = 0; 197 int rc;197 errno_t rc; 198 198 199 199 /* … … 237 237 * @return EOK on success or an error code. 238 238 */ 239 int239 errno_t 240 240 fat_fill_gap(fat_bs_t *bs, fat_node_t *nodep, fat_cluster_t mcl, aoff64_t pos) 241 241 { 242 242 block_t *b; 243 243 aoff64_t o, boundary; 244 int rc;244 errno_t rc; 245 245 246 246 boundary = ROUND_UP(nodep->size, BPS(bs) * SPC(bs)); … … 289 289 * @return EOK or an error code. 290 290 */ 291 static int291 static errno_t 292 292 fat_get_cluster_fat12(fat_bs_t *bs, service_id_t service_id, unsigned fatno, 293 293 fat_cluster_t clst, fat_cluster_t *value) … … 296 296 uint16_t byte1, byte2; 297 297 aoff64_t offset; 298 int rc;298 errno_t rc; 299 299 300 300 offset = (clst + clst / 2); … … 359 359 * @return EOK or an error code. 360 360 */ 361 static int361 static errno_t 362 362 fat_get_cluster_fat16(fat_bs_t *bs, service_id_t service_id, unsigned fatno, 363 363 fat_cluster_t clst, fat_cluster_t *value) … … 365 365 block_t *b; 366 366 aoff64_t offset; 367 int rc;367 errno_t rc; 368 368 369 369 offset = (clst * FAT16_CLST_SIZE); … … 390 390 * @return EOK or an error code. 391 391 */ 392 static int392 static errno_t 393 393 fat_get_cluster_fat32(fat_bs_t *bs, service_id_t service_id, unsigned fatno, 394 394 fat_cluster_t clst, fat_cluster_t *value) … … 396 396 block_t *b; 397 397 aoff64_t offset; 398 int rc;398 errno_t rc; 399 399 400 400 offset = (clst * FAT32_CLST_SIZE); … … 423 423 * @return EOK or an error code. 424 424 */ 425 int425 errno_t 426 426 fat_get_cluster(fat_bs_t *bs, service_id_t service_id, unsigned fatno, 427 427 fat_cluster_t clst, fat_cluster_t *value) 428 428 { 429 int rc;429 errno_t rc; 430 430 431 431 assert(fatno < FATCNT(bs)); … … 451 451 * @return EOK on success or an error code. 452 452 */ 453 static int453 static errno_t 454 454 fat_set_cluster_fat12(fat_bs_t *bs, service_id_t service_id, unsigned fatno, 455 455 fat_cluster_t clst, fat_cluster_t value) … … 458 458 aoff64_t offset; 459 459 uint16_t byte1, byte2; 460 int rc;460 errno_t rc; 461 461 462 462 offset = (clst + clst / 2); … … 539 539 * @return EOK on success or an error code. 540 540 */ 541 static int541 static errno_t 542 542 fat_set_cluster_fat16(fat_bs_t *bs, service_id_t service_id, unsigned fatno, 543 543 fat_cluster_t clst, fat_cluster_t value) … … 545 545 block_t *b; 546 546 aoff64_t offset; 547 int rc;547 errno_t rc; 548 548 549 549 offset = (clst * FAT16_CLST_SIZE); … … 572 572 * @return EOK on success or an error code. 573 573 */ 574 static int574 static errno_t 575 575 fat_set_cluster_fat32(fat_bs_t *bs, service_id_t service_id, unsigned fatno, 576 576 fat_cluster_t clst, fat_cluster_t value) … … 578 578 block_t *b; 579 579 aoff64_t offset; 580 int rc;580 errno_t rc; 581 581 fat_cluster_t temp; 582 582 … … 609 609 * @return EOK on success or an error code. 610 610 */ 611 int611 errno_t 612 612 fat_set_cluster(fat_bs_t *bs, service_id_t service_id, unsigned fatno, 613 613 fat_cluster_t clst, fat_cluster_t value) 614 614 { 615 int rc;615 errno_t rc; 616 616 617 617 assert(fatno < FATCNT(bs)); … … 636 636 * @return EOK on success or an error code. 637 637 */ 638 int fat_alloc_shadow_clusters(fat_bs_t *bs, service_id_t service_id,638 errno_t fat_alloc_shadow_clusters(fat_bs_t *bs, service_id_t service_id, 639 639 fat_cluster_t *lifo, unsigned nclsts) 640 640 { … … 642 642 unsigned c; 643 643 fat_cluster_t clst_last1 = FAT_CLST_LAST1(bs); 644 int rc;644 errno_t rc; 645 645 646 646 for (fatno = FAT1 + 1; fatno < FATCNT(bs); fatno++) { … … 673 673 * @return EOK on success, an error code otherwise. 674 674 */ 675 int675 errno_t 676 676 fat_alloc_clusters(fat_bs_t *bs, service_id_t service_id, unsigned nclsts, 677 677 fat_cluster_t *mcl, fat_cluster_t *lcl) … … 682 682 fat_cluster_t value = 0; 683 683 fat_cluster_t clst_last1 = FAT_CLST_LAST1(bs); 684 int rc = EOK;684 errno_t rc = EOK; 685 685 686 686 lifo = (fat_cluster_t *) malloc(nclsts * sizeof(fat_cluster_t)); … … 744 744 * @return EOK on success or an error code. 745 745 */ 746 int746 errno_t 747 747 fat_free_clusters(fat_bs_t *bs, service_id_t service_id, fat_cluster_t firstc) 748 748 { … … 750 750 fat_cluster_t nextc = 0; 751 751 fat_cluster_t clst_bad = FAT_CLST_BAD(bs); 752 int rc;752 errno_t rc; 753 753 754 754 /* Mark all clusters in the chain as free in all copies of FAT. */ … … 782 782 * @return EOK on success or an error code. 783 783 */ 784 int fat_append_clusters(fat_bs_t *bs, fat_node_t *nodep, fat_cluster_t mcl,784 errno_t fat_append_clusters(fat_bs_t *bs, fat_node_t *nodep, fat_cluster_t mcl, 785 785 fat_cluster_t lcl) 786 786 { … … 788 788 fat_cluster_t lastc = 0; 789 789 uint8_t fatno; 790 int rc;790 errno_t rc; 791 791 792 792 if (nodep->firstc == FAT_CLST_RES0) { … … 829 829 * @return EOK on success or an error code. 830 830 */ 831 int fat_chop_clusters(fat_bs_t *bs, fat_node_t *nodep, fat_cluster_t lcl)831 errno_t fat_chop_clusters(fat_bs_t *bs, fat_node_t *nodep, fat_cluster_t lcl) 832 832 { 833 833 fat_cluster_t clst_last1 = FAT_CLST_LAST1(bs); 834 int rc;834 errno_t rc; 835 835 service_id_t service_id = nodep->idx->service_id; 836 836 … … 880 880 } 881 881 882 int882 errno_t 883 883 fat_zero_cluster(struct fat_bs *bs, service_id_t service_id, fat_cluster_t c) 884 884 { 885 885 int i; 886 886 block_t *b; 887 int rc;887 errno_t rc; 888 888 889 889 for (i = 0; i < SPC(bs); i++) { … … 908 908 * does not contain a fat file system. 909 909 */ 910 int fat_sanity_check(fat_bs_t *bs, service_id_t service_id)910 errno_t fat_sanity_check(fat_bs_t *bs, service_id_t service_id) 911 911 { 912 912 fat_cluster_t e0 = 0; 913 913 fat_cluster_t e1 = 0; 914 914 unsigned fat_no; 915 int rc;915 errno_t rc; 916 916 917 917 /* Check number of FATs. */ -
uspace/srv/fs/fat/fat_fat.h
rfacacc71 r46577995 108 108 #define fat_clusters_get(numc, bs, sid, fc) \ 109 109 fat_cluster_walk((bs), (sid), (fc), NULL, (numc), (uint32_t) -1) 110 extern int fat_cluster_walk(struct fat_bs *, service_id_t, fat_cluster_t,110 extern errno_t fat_cluster_walk(struct fat_bs *, service_id_t, fat_cluster_t, 111 111 fat_cluster_t *, uint32_t *, uint32_t); 112 112 113 extern int fat_block_get(block_t **, struct fat_bs *, struct fat_node *,113 extern errno_t fat_block_get(block_t **, struct fat_bs *, struct fat_node *, 114 114 aoff64_t, int); 115 extern int _fat_block_get(block_t **, struct fat_bs *, service_id_t,115 extern errno_t _fat_block_get(block_t **, struct fat_bs *, service_id_t, 116 116 fat_cluster_t, fat_cluster_t *, aoff64_t, int); 117 117 118 extern int fat_append_clusters(struct fat_bs *, struct fat_node *,118 extern errno_t fat_append_clusters(struct fat_bs *, struct fat_node *, 119 119 fat_cluster_t, fat_cluster_t); 120 extern int fat_chop_clusters(struct fat_bs *, struct fat_node *,120 extern errno_t fat_chop_clusters(struct fat_bs *, struct fat_node *, 121 121 fat_cluster_t); 122 extern int fat_alloc_clusters(struct fat_bs *, service_id_t, unsigned,122 extern errno_t fat_alloc_clusters(struct fat_bs *, service_id_t, unsigned, 123 123 fat_cluster_t *, fat_cluster_t *); 124 extern int fat_free_clusters(struct fat_bs *, service_id_t, fat_cluster_t);125 extern int fat_alloc_shadow_clusters(struct fat_bs *, service_id_t,124 extern errno_t fat_free_clusters(struct fat_bs *, service_id_t, fat_cluster_t); 125 extern errno_t fat_alloc_shadow_clusters(struct fat_bs *, service_id_t, 126 126 fat_cluster_t *, unsigned); 127 extern int fat_get_cluster(struct fat_bs *, service_id_t, unsigned,127 extern errno_t fat_get_cluster(struct fat_bs *, service_id_t, unsigned, 128 128 fat_cluster_t, fat_cluster_t *); 129 extern int fat_set_cluster(struct fat_bs *, service_id_t, unsigned,129 extern errno_t fat_set_cluster(struct fat_bs *, service_id_t, unsigned, 130 130 fat_cluster_t, fat_cluster_t); 131 extern int fat_fill_gap(struct fat_bs *, struct fat_node *, fat_cluster_t,131 extern errno_t fat_fill_gap(struct fat_bs *, struct fat_node *, fat_cluster_t, 132 132 aoff64_t); 133 extern int fat_zero_cluster(struct fat_bs *, service_id_t, fat_cluster_t);134 extern int fat_sanity_check(struct fat_bs *, service_id_t);133 extern errno_t fat_zero_cluster(struct fat_bs *, service_id_t, fat_cluster_t); 134 extern errno_t fat_sanity_check(struct fat_bs *, service_id_t); 135 135 136 136 #endif -
uspace/srv/fs/fat/fat_idx.c
rfacacc71 r46577995 328 328 } 329 329 330 static int fat_idx_create(fat_idx_t **fidxp, service_id_t service_id)330 static errno_t fat_idx_create(fat_idx_t **fidxp, service_id_t service_id) 331 331 { 332 332 fat_idx_t *fidx; … … 350 350 } 351 351 352 int fat_idx_get_new(fat_idx_t **fidxp, service_id_t service_id)352 errno_t fat_idx_get_new(fat_idx_t **fidxp, service_id_t service_id) 353 353 { 354 354 fat_idx_t *fidx; 355 int rc;355 errno_t rc; 356 356 357 357 fibril_mutex_lock(&used_lock); … … 386 386 fidx = hash_table_get_inst(l, fat_idx_t, uph_link); 387 387 } else { 388 int rc;388 errno_t rc; 389 389 390 390 rc = fat_idx_create(&fidx, service_id); … … 467 467 } 468 468 469 int fat_idx_init(void)469 errno_t fat_idx_init(void) 470 470 { 471 471 if (!hash_table_create(&up_hash, 0, 0, &uph_ops)) … … 486 486 } 487 487 488 int fat_idx_init_by_service_id(service_id_t service_id)488 errno_t fat_idx_init_by_service_id(service_id_t service_id) 489 489 { 490 490 unused_t *u; 491 int rc = EOK;491 errno_t rc = EOK; 492 492 493 493 u = (unused_t *) malloc(sizeof(unused_t)); -
uspace/srv/fs/fat/fat_ops.c
rfacacc71 r46577995 73 73 * Forward declarations of FAT libfs operations. 74 74 */ 75 static int fat_root_get(fs_node_t **, service_id_t);76 static int fat_match(fs_node_t **, fs_node_t *, const char *);77 static int fat_node_get(fs_node_t **, service_id_t, fs_index_t);78 static int fat_node_open(fs_node_t *);79 static int fat_node_put(fs_node_t *);80 static int fat_create_node(fs_node_t **, service_id_t, int);81 static int fat_destroy_node(fs_node_t *);82 static int fat_link(fs_node_t *, fs_node_t *, const char *);83 static int fat_unlink(fs_node_t *, fs_node_t *, const char *);84 static int fat_has_children(bool *, fs_node_t *);75 static errno_t fat_root_get(fs_node_t **, service_id_t); 76 static errno_t fat_match(fs_node_t **, fs_node_t *, const char *); 77 static errno_t fat_node_get(fs_node_t **, service_id_t, fs_index_t); 78 static errno_t fat_node_open(fs_node_t *); 79 static errno_t fat_node_put(fs_node_t *); 80 static errno_t fat_create_node(fs_node_t **, service_id_t, int); 81 static errno_t fat_destroy_node(fs_node_t *); 82 static errno_t fat_link(fs_node_t *, fs_node_t *, const char *); 83 static errno_t fat_unlink(fs_node_t *, fs_node_t *, const char *); 84 static errno_t fat_has_children(bool *, fs_node_t *); 85 85 static fs_index_t fat_index_get(fs_node_t *); 86 86 static aoff64_t fat_size_get(fs_node_t *); … … 89 89 static bool fat_is_file(fs_node_t *node); 90 90 static service_id_t fat_service_get(fs_node_t *node); 91 static int fat_size_block(service_id_t, uint32_t *);92 static int fat_total_block_count(service_id_t, uint64_t *);93 static int fat_free_block_count(service_id_t, uint64_t *);91 static errno_t fat_size_block(service_id_t, uint32_t *); 92 static errno_t fat_total_block_count(service_id_t, uint64_t *); 93 static errno_t fat_free_block_count(service_id_t, uint64_t *); 94 94 95 95 /* … … 114 114 } 115 115 116 static int fat_node_sync(fat_node_t *node)116 static errno_t fat_node_sync(fat_node_t *node) 117 117 { 118 118 block_t *b; 119 119 fat_bs_t *bs; 120 120 fat_dentry_t *d; 121 int rc;121 errno_t rc; 122 122 123 123 assert(node->dirty); … … 148 148 } 149 149 150 static int fat_node_fini_by_service_id(service_id_t service_id)151 { 152 int rc;150 static errno_t fat_node_fini_by_service_id(service_id_t service_id) 151 { 152 errno_t rc; 153 153 154 154 /* … … 204 204 } 205 205 206 static int fat_node_get_new(fat_node_t **nodepp)206 static errno_t fat_node_get_new(fat_node_t **nodepp) 207 207 { 208 208 fs_node_t *fn; 209 209 fat_node_t *nodep; 210 int rc;210 errno_t rc; 211 211 212 212 fibril_mutex_lock(&ffn_mutex); … … 266 266 * @param idxp Locked index structure. 267 267 */ 268 static int fat_node_get_core(fat_node_t **nodepp, fat_idx_t *idxp)268 static errno_t fat_node_get_core(fat_node_t **nodepp, fat_idx_t *idxp) 269 269 { 270 270 block_t *b; … … 272 272 fat_dentry_t *d; 273 273 fat_node_t *nodep = NULL; 274 int rc;274 errno_t rc; 275 275 276 276 if (idxp->nodep) { … … 365 365 */ 366 366 367 int fat_root_get(fs_node_t **rfn, service_id_t service_id)367 errno_t fat_root_get(fs_node_t **rfn, service_id_t service_id) 368 368 { 369 369 return fat_node_get(rfn, service_id, 0); 370 370 } 371 371 372 int fat_match(fs_node_t **rfn, fs_node_t *pfn, const char *component)372 errno_t fat_match(fs_node_t **rfn, fs_node_t *pfn, const char *component) 373 373 { 374 374 fat_node_t *parentp = FAT_NODE(pfn); … … 376 376 fat_dentry_t *d; 377 377 service_id_t service_id; 378 int rc;378 errno_t rc; 379 379 380 380 fibril_mutex_lock(&parentp->idx->lock); … … 426 426 427 427 /** Instantiate a FAT in-core node. */ 428 int fat_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index)428 errno_t fat_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index) 429 429 { 430 430 fat_node_t *nodep; 431 431 fat_idx_t *idxp; 432 int rc;432 errno_t rc; 433 433 434 434 idxp = fat_idx_get_by_index(service_id, index); … … 445 445 } 446 446 447 int fat_node_open(fs_node_t *fn)447 errno_t fat_node_open(fs_node_t *fn) 448 448 { 449 449 /* … … 454 454 } 455 455 456 int fat_node_put(fs_node_t *fn)456 errno_t fat_node_put(fs_node_t *fn) 457 457 { 458 458 fat_node_t *nodep = FAT_NODE(fn); … … 483 483 } 484 484 485 int fat_create_node(fs_node_t **rfn, service_id_t service_id, int flags)485 errno_t fat_create_node(fs_node_t **rfn, service_id_t service_id, int flags) 486 486 { 487 487 fat_idx_t *idxp; … … 489 489 fat_bs_t *bs; 490 490 fat_cluster_t mcl, lcl; 491 int rc;491 errno_t rc; 492 492 493 493 bs = block_bb_get(service_id); … … 538 538 } 539 539 540 int fat_destroy_node(fs_node_t *fn)540 errno_t fat_destroy_node(fs_node_t *fn) 541 541 { 542 542 fat_node_t *nodep = FAT_NODE(fn); 543 543 fat_bs_t *bs; 544 544 bool has_children; 545 int rc;545 errno_t rc; 546 546 547 547 /* … … 575 575 } 576 576 577 int fat_link(fs_node_t *pfn, fs_node_t *cfn, const char *name)577 errno_t fat_link(fs_node_t *pfn, fs_node_t *cfn, const char *name) 578 578 { 579 579 fat_node_t *parentp = FAT_NODE(pfn); … … 584 584 fat_directory_t di; 585 585 fat_dentry_t de; 586 int rc;586 errno_t rc; 587 587 588 588 fibril_mutex_lock(&childp->lock); … … 696 696 } 697 697 698 int fat_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *nm)698 errno_t fat_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *nm) 699 699 { 700 700 fat_node_t *parentp = FAT_NODE(pfn); 701 701 fat_node_t *childp = FAT_NODE(cfn); 702 702 bool has_children; 703 int rc;703 errno_t rc; 704 704 705 705 if (!parentp) … … 753 753 } 754 754 755 int fat_has_children(bool *has_children, fs_node_t *fn)755 errno_t fat_has_children(bool *has_children, fs_node_t *fn) 756 756 { 757 757 fat_bs_t *bs; … … 760 760 block_t *b; 761 761 unsigned i, j; 762 int rc;762 errno_t rc; 763 763 764 764 if (nodep->type != FAT_DIRECTORY) { … … 843 843 } 844 844 845 int fat_size_block(service_id_t service_id, uint32_t *size)845 errno_t fat_size_block(service_id_t service_id, uint32_t *size) 846 846 { 847 847 fat_bs_t *bs; … … 853 853 } 854 854 855 int fat_total_block_count(service_id_t service_id, uint64_t *count)855 errno_t fat_total_block_count(service_id_t service_id, uint64_t *count) 856 856 { 857 857 fat_bs_t *bs; … … 863 863 } 864 864 865 int fat_free_block_count(service_id_t service_id, uint64_t *count)865 errno_t fat_free_block_count(service_id_t service_id, uint64_t *count) 866 866 { 867 867 fat_bs_t *bs; 868 868 fat_cluster_t e0; 869 869 uint64_t block_count; 870 int rc;870 errno_t rc; 871 871 uint32_t cluster_no, clusters; 872 872 … … 910 910 }; 911 911 912 static int fat_fs_open(service_id_t service_id, enum cache_mode cmode,912 static errno_t fat_fs_open(service_id_t service_id, enum cache_mode cmode, 913 913 fs_node_t **rrfn, fat_idx_t **rridxp) 914 914 { 915 915 fat_bs_t *bs; 916 int rc;916 errno_t rc; 917 917 918 918 /* initialize libblock */ … … 1037 1037 */ 1038 1038 1039 static int fat_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)1039 static errno_t fat_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info) 1040 1040 { 1041 1041 fat_idx_t *ridxp; … … 1044 1044 fat_directory_t di; 1045 1045 char label[FAT_VOLLABEL_LEN + 1]; 1046 int rc;1046 errno_t rc; 1047 1047 1048 1048 rc = fat_fs_open(service_id, CACHE_MODE_WT, &rfn, &ridxp); … … 1076 1076 } 1077 1077 1078 static int1078 static errno_t 1079 1079 fat_mounted(service_id_t service_id, const char *opts, fs_index_t *index, 1080 1080 aoff64_t *size) … … 1084 1084 fat_idx_t *ridxp; 1085 1085 fs_node_t *rfn; 1086 int rc;1086 errno_t rc; 1087 1087 1088 1088 instance = malloc(sizeof(fat_instance_t)); … … 1125 1125 } 1126 1126 1127 static int fat_update_fat32_fsinfo(service_id_t service_id)1127 static errno_t fat_update_fat32_fsinfo(service_id_t service_id) 1128 1128 { 1129 1129 fat_bs_t *bs; 1130 1130 fat32_fsinfo_t *info; 1131 1131 block_t *b; 1132 int rc;1132 errno_t rc; 1133 1133 1134 1134 bs = block_bb_get(service_id); … … 1156 1156 } 1157 1157 1158 static int fat_unmounted(service_id_t service_id)1158 static errno_t fat_unmounted(service_id_t service_id) 1159 1159 { 1160 1160 fs_node_t *fn; 1161 1161 fat_node_t *nodep; 1162 1162 fat_bs_t *bs; 1163 int rc;1163 errno_t rc; 1164 1164 1165 1165 bs = block_bb_get(service_id); … … 1208 1208 } 1209 1209 1210 static int1210 static errno_t 1211 1211 fat_read(service_id_t service_id, fs_index_t index, aoff64_t pos, 1212 1212 size_t *rbytes) … … 1217 1217 size_t bytes; 1218 1218 block_t *b; 1219 int rc;1219 errno_t rc; 1220 1220 1221 1221 rc = fat_node_get(&fn, service_id, index); … … 1318 1318 } 1319 1319 1320 static int1320 static errno_t 1321 1321 fat_write(service_id_t service_id, fs_index_t index, aoff64_t pos, 1322 1322 size_t *wbytes, aoff64_t *nsize) … … 1329 1329 aoff64_t boundary; 1330 1330 int flags = BLOCK_FLAGS_NONE; 1331 int rc;1331 errno_t rc; 1332 1332 1333 1333 rc = fat_node_get(&fn, service_id, index); … … 1455 1455 } 1456 1456 1457 static int1457 static errno_t 1458 1458 fat_truncate(service_id_t service_id, fs_index_t index, aoff64_t size) 1459 1459 { … … 1461 1461 fat_node_t *nodep; 1462 1462 fat_bs_t *bs; 1463 int rc;1463 errno_t rc; 1464 1464 1465 1465 rc = fat_node_get(&fn, service_id, index); … … 1514 1514 } 1515 1515 1516 static int fat_close(service_id_t service_id, fs_index_t index)1517 { 1518 return EOK; 1519 } 1520 1521 static int fat_destroy(service_id_t service_id, fs_index_t index)1516 static errno_t fat_close(service_id_t service_id, fs_index_t index) 1517 { 1518 return EOK; 1519 } 1520 1521 static errno_t fat_destroy(service_id_t service_id, fs_index_t index) 1522 1522 { 1523 1523 fs_node_t *fn; 1524 1524 fat_node_t *nodep; 1525 int rc;1525 errno_t rc; 1526 1526 1527 1527 rc = fat_node_get(&fn, service_id, index); … … 1542 1542 } 1543 1543 1544 static int fat_sync(service_id_t service_id, fs_index_t index)1544 static errno_t fat_sync(service_id_t service_id, fs_index_t index) 1545 1545 { 1546 1546 fs_node_t *fn; 1547 int rc = fat_node_get(&fn, service_id, index);1547 errno_t rc = fat_node_get(&fn, service_id, index); 1548 1548 if (rc != EOK) 1549 1549 return rc; -
uspace/srv/fs/locfs/locfs.c
rfacacc71 r46577995 86 86 } 87 87 88 int rc = fs_register(vfs_sess, &locfs_vfs_info, &locfs_ops,88 errno_t rc = fs_register(vfs_sess, &locfs_vfs_info, &locfs_ops, 89 89 &locfs_libfs_ops); 90 90 if (rc != EOK) { -
uspace/srv/fs/locfs/locfs_ops.c
rfacacc71 r46577995 101 101 }; 102 102 103 static int locfs_node_get_internal(fs_node_t **rfn, loc_object_type_t type,103 static errno_t locfs_node_get_internal(fs_node_t **rfn, loc_object_type_t type, 104 104 service_id_t service_id) 105 105 { … … 125 125 } 126 126 127 static int locfs_root_get(fs_node_t **rfn, service_id_t service_id)127 static errno_t locfs_root_get(fs_node_t **rfn, service_id_t service_id) 128 128 { 129 129 return locfs_node_get_internal(rfn, LOC_OBJECT_NONE, 0); 130 130 } 131 131 132 static int locfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component)132 static errno_t locfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component) 133 133 { 134 134 locfs_node_t *node = (locfs_node_t *) pfn->data; 135 int ret;135 errno_t ret; 136 136 137 137 if (node->service_id == 0) { … … 208 208 } 209 209 210 static int locfs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index)210 static errno_t locfs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index) 211 211 { 212 212 return locfs_node_get_internal(rfn, loc_id_probe(index), index); 213 213 } 214 214 215 static int locfs_node_open(fs_node_t *fn)215 static errno_t locfs_node_open(fs_node_t *fn) 216 216 { 217 217 locfs_node_t *node = (locfs_node_t *) fn->data; … … 312 312 } 313 313 314 static int locfs_node_put(fs_node_t *fn)314 static errno_t locfs_node_put(fs_node_t *fn) 315 315 { 316 316 free(fn->data); … … 319 319 } 320 320 321 static int locfs_create_node(fs_node_t **rfn, service_id_t service_id, int lflag)321 static errno_t locfs_create_node(fs_node_t **rfn, service_id_t service_id, int lflag) 322 322 { 323 323 assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY)); … … 327 327 } 328 328 329 static int locfs_destroy_node(fs_node_t *fn)329 static errno_t locfs_destroy_node(fs_node_t *fn) 330 330 { 331 331 return ENOTSUP; 332 332 } 333 333 334 static int locfs_link_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm)334 static errno_t locfs_link_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm) 335 335 { 336 336 return ENOTSUP; 337 337 } 338 338 339 static int locfs_unlink_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm)339 static errno_t locfs_unlink_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm) 340 340 { 341 341 return ENOTSUP; 342 342 } 343 343 344 static int locfs_has_children(bool *has_children, fs_node_t *fn)344 static errno_t locfs_has_children(bool *has_children, fs_node_t *fn) 345 345 { 346 346 locfs_node_t *node = (locfs_node_t *) fn->data; … … 455 455 } 456 456 457 static int locfs_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)457 static errno_t locfs_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info) 458 458 { 459 459 return ENOTSUP; 460 460 } 461 461 462 static int locfs_mounted(service_id_t service_id, const char *opts,462 static errno_t locfs_mounted(service_id_t service_id, const char *opts, 463 463 fs_index_t *index, aoff64_t *size) 464 464 { … … 468 468 } 469 469 470 static int locfs_unmounted(service_id_t service_id)470 static errno_t locfs_unmounted(service_id_t service_id) 471 471 { 472 472 return ENOTSUP; 473 473 } 474 474 475 static int475 static errno_t 476 476 locfs_read(service_id_t service_id, fs_index_t index, aoff64_t pos, 477 477 size_t *rbytes) … … 590 590 591 591 /* Wait for reply from the driver. */ 592 int rc;592 errno_t rc; 593 593 async_wait_for(msg, &rc); 594 594 595 595 /* Do not propagate EHANGUP back to VFS. */ 596 if (( int) rc == EHANGUP)596 if ((errno_t) rc == EHANGUP) 597 597 rc = ENOTSUP; 598 598 … … 604 604 } 605 605 606 static int606 static errno_t 607 607 locfs_write(service_id_t service_id, fs_index_t index, aoff64_t pos, 608 608 size_t *wbytes, aoff64_t *nsize) … … 654 654 655 655 /* Wait for reply from the driver. */ 656 int rc;656 errno_t rc; 657 657 async_wait_for(msg, &rc); 658 658 659 659 /* Do not propagate EHANGUP back to VFS. */ 660 if (( int) rc == EHANGUP)660 if ((errno_t) rc == EHANGUP) 661 661 rc = ENOTSUP; 662 662 … … 669 669 } 670 670 671 static int671 static errno_t 672 672 locfs_truncate(service_id_t service_id, fs_index_t index, aoff64_t size) 673 673 { … … 675 675 } 676 676 677 static int locfs_close(service_id_t service_id, fs_index_t index)677 static errno_t locfs_close(service_id_t service_id, fs_index_t index) 678 678 { 679 679 if (index == 0) … … 715 715 } 716 716 717 static int locfs_sync(service_id_t service_id, fs_index_t index)717 static errno_t locfs_sync(service_id_t service_id, fs_index_t index) 718 718 { 719 719 if (index == 0) … … 752 752 753 753 /* Wait for reply from the driver */ 754 int rc;754 errno_t rc; 755 755 async_wait_for(msg, &rc); 756 756 … … 761 761 } 762 762 763 static int locfs_destroy(service_id_t service_id, fs_index_t index)763 static errno_t locfs_destroy(service_id_t service_id, fs_index_t index) 764 764 { 765 765 return ENOTSUP; -
uspace/srv/fs/mfs/mfs.c
rfacacc71 r46577995 59 59 int main(int argc, char **argv) 60 60 { 61 int rc;61 errno_t rc; 62 62 63 63 printf(NAME ": HelenOS Minix file system server\n"); -
uspace/srv/fs/mfs/mfs.h
rfacacc71 r46577995 169 169 extern libfs_ops_t mfs_libfs_ops; 170 170 171 extern int171 extern errno_t 172 172 mfs_global_init(void); 173 173 174 174 /* mfs_inode.c */ 175 extern int175 extern errno_t 176 176 mfs_get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i, 177 177 fs_index_t index); 178 178 179 extern int179 extern errno_t 180 180 mfs_put_inode(struct mfs_node *mnode); 181 181 182 extern int182 extern errno_t 183 183 mfs_inode_shrink(struct mfs_node *mnode, size_t size_shrink); 184 184 185 185 /* mfs_rw.c */ 186 extern int186 extern errno_t 187 187 mfs_read_map(uint32_t *b, const struct mfs_node *mnode, const uint32_t pos); 188 188 189 extern int189 extern errno_t 190 190 mfs_write_map(struct mfs_node *mnode, uint32_t pos, uint32_t new_zone, 191 191 uint32_t *old_zone); 192 192 193 extern int193 extern errno_t 194 194 mfs_prune_ind_zones(struct mfs_node *mnode, size_t new_size); 195 195 196 196 /* mfs_dentry.c */ 197 extern int197 extern errno_t 198 198 mfs_read_dentry(struct mfs_node *mnode, 199 199 struct mfs_dentry_info *d_info, unsigned index); 200 200 201 extern int201 extern errno_t 202 202 mfs_write_dentry(struct mfs_dentry_info *d_info); 203 203 204 extern int204 extern errno_t 205 205 mfs_remove_dentry(struct mfs_node *mnode, const char *d_name); 206 206 207 extern int207 extern errno_t 208 208 mfs_insert_dentry(struct mfs_node *mnode, const char *d_name, fs_index_t d_inum); 209 209 210 210 /* mfs_balloc.c */ 211 extern int211 extern errno_t 212 212 mfs_alloc_inode(struct mfs_instance *inst, uint32_t *inum); 213 213 214 extern int214 extern errno_t 215 215 mfs_free_inode(struct mfs_instance *inst, uint32_t inum); 216 216 217 extern int217 extern errno_t 218 218 mfs_alloc_zone(struct mfs_instance *inst, uint32_t *zone); 219 219 220 extern int220 extern errno_t 221 221 mfs_free_zone(struct mfs_instance *inst, uint32_t zone); 222 222 223 extern int223 extern errno_t 224 224 mfs_count_free_zones(struct mfs_instance *inst, uint32_t *zones); 225 225 226 extern int226 extern errno_t 227 227 mfs_count_free_inodes(struct mfs_instance *inst, uint32_t *inodes); 228 228 -
uspace/srv/fs/mfs/mfs_balloc.c
rfacacc71 r46577995 38 38 const bool native, unsigned start_bit); 39 39 40 static int40 static errno_t 41 41 mfs_free_bit(struct mfs_instance *inst, uint32_t idx, bmap_id_t bid); 42 42 43 static int43 static errno_t 44 44 mfs_alloc_bit(struct mfs_instance *inst, uint32_t *idx, bmap_id_t bid); 45 45 46 static int46 static errno_t 47 47 mfs_count_free_bits(struct mfs_instance *inst, bmap_id_t bid, uint32_t *free); 48 48 … … 56 56 * @return EOK on success or an error code. 57 57 */ 58 int58 errno_t 59 59 mfs_alloc_inode(struct mfs_instance *inst, uint32_t *inum) 60 60 { 61 int r = mfs_alloc_bit(inst, inum, BMAP_INODE);61 errno_t r = mfs_alloc_bit(inst, inum, BMAP_INODE); 62 62 return r; 63 63 } … … 70 70 * @return EOK on success or an error code. 71 71 */ 72 int72 errno_t 73 73 mfs_free_inode(struct mfs_instance *inst, uint32_t inum) 74 74 { … … 84 84 * @return EOK on success or an error code. 85 85 */ 86 int86 errno_t 87 87 mfs_alloc_zone(struct mfs_instance *inst, uint32_t *zone) 88 88 { 89 int r = mfs_alloc_bit(inst, zone, BMAP_ZONE);89 errno_t r = mfs_alloc_bit(inst, zone, BMAP_ZONE); 90 90 if (r != EOK) 91 91 return r; … … 107 107 * @return EOK on success or an error code. 108 108 */ 109 int109 errno_t 110 110 mfs_free_zone(struct mfs_instance *inst, uint32_t zone) 111 111 { 112 int r;112 errno_t r; 113 113 114 114 zone -= inst->sbi->firstdatazone - 1; … … 134 134 * @return EOK on success or an error code. 135 135 */ 136 int136 errno_t 137 137 mfs_count_free_zones(struct mfs_instance *inst, uint32_t *zones) 138 138 { … … 149 149 */ 150 150 151 int151 errno_t 152 152 mfs_count_free_inodes(struct mfs_instance *inst, uint32_t *inodes) 153 153 { … … 164 164 * @return EOK on success or an error code. 165 165 */ 166 static int166 static errno_t 167 167 mfs_count_free_bits(struct mfs_instance *inst, bmap_id_t bid, uint32_t *free) 168 168 { 169 int r;169 errno_t r; 170 170 unsigned start_block; 171 171 unsigned long nblocks; … … 228 228 * @return EOK on success or an error code. 229 229 */ 230 static int230 static errno_t 231 231 mfs_free_bit(struct mfs_instance *inst, uint32_t idx, bmap_id_t bid) 232 232 { 233 233 struct mfs_sb_info *sbi; 234 int r;234 errno_t r; 235 235 unsigned start_block; 236 236 unsigned *search; … … 295 295 * @return EOK on success or an error code. 296 296 */ 297 static int297 static errno_t 298 298 mfs_alloc_bit(struct mfs_instance *inst, uint32_t *idx, bmap_id_t bid) 299 299 { … … 303 303 unsigned *search, i, start_block; 304 304 unsigned bits_per_block; 305 int r;305 errno_t r; 306 306 int freebit; 307 307 -
uspace/srv/fs/mfs/mfs_dentry.c
rfacacc71 r46577995 42 42 * @return EOK on success or an error code. 43 43 */ 44 int44 errno_t 45 45 mfs_read_dentry(struct mfs_node *mnode, 46 46 struct mfs_dentry_info *d_info, unsigned index) … … 52 52 block_t *b; 53 53 54 int r = mfs_read_map(&block, mnode, index * sbi->dirsize);54 errno_t r = mfs_read_map(&block, mnode, index * sbi->dirsize); 55 55 if (r != EOK) 56 56 goto out_err; … … 105 105 * @return EOK on success or an error code. 106 106 */ 107 int107 errno_t 108 108 mfs_write_dentry(struct mfs_dentry_info *d_info) 109 109 { … … 114 114 block_t *b; 115 115 uint32_t block; 116 int r;116 errno_t r; 117 117 118 118 r = mfs_read_map(&block, mnode, d_off_bytes); … … 156 156 * @return EOK on success or an error code. 157 157 */ 158 int158 errno_t 159 159 mfs_remove_dentry(struct mfs_node *mnode, const char *d_name) 160 160 { 161 161 struct mfs_sb_info *sbi = mnode->instance->sbi; 162 162 struct mfs_dentry_info d_info; 163 int r;163 errno_t r; 164 164 165 165 const size_t name_len = str_size(d_name); … … 197 197 * @return EOK on success or an error code. 198 198 */ 199 int199 errno_t 200 200 mfs_insert_dentry(struct mfs_node *mnode, const char *d_name, 201 201 fs_index_t d_inum) 202 202 { 203 int r;203 errno_t r; 204 204 struct mfs_sb_info *sbi = mnode->instance->sbi; 205 205 struct mfs_dentry_info d_info; -
uspace/srv/fs/mfs/mfs_inode.c
rfacacc71 r46577995 34 34 #include "mfs.h" 35 35 36 static int36 static errno_t 37 37 mfs_write_inode_raw(struct mfs_node *mnode); 38 38 39 static int39 static errno_t 40 40 mfs2_write_inode_raw(struct mfs_node *mnode); 41 41 42 static int42 static errno_t 43 43 mfs_read_inode_raw(const struct mfs_instance *instance, 44 44 struct mfs_ino_info **ino_ptr, uint16_t inum); 45 45 46 static int46 static errno_t 47 47 mfs2_read_inode_raw(const struct mfs_instance *instance, 48 48 struct mfs_ino_info **ino_ptr, uint32_t inum); … … 57 57 * @return EOK on success or an error code. 58 58 */ 59 int59 errno_t 60 60 mfs_get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i, 61 61 fs_index_t index) 62 62 { 63 63 struct mfs_sb_info *sbi = inst->sbi; 64 int r;64 errno_t r; 65 65 66 66 if (sbi->fs_version == MFS_VERSION_V1) { … … 75 75 } 76 76 77 static int77 static errno_t 78 78 mfs_read_inode_raw(const struct mfs_instance *instance, 79 79 struct mfs_ino_info **ino_ptr, uint16_t inum) … … 84 84 block_t *b; 85 85 int i; 86 int r;86 errno_t r; 87 87 88 88 sbi = instance->sbi; … … 135 135 } 136 136 137 static int137 static errno_t 138 138 mfs2_read_inode_raw(const struct mfs_instance *instance, 139 139 struct mfs_ino_info **ino_ptr, uint32_t inum) … … 144 144 block_t *b; 145 145 int i; 146 int r;146 errno_t r; 147 147 148 148 ino_i = malloc(sizeof(*ino_i)); … … 203 203 * @return EOK on success or an error code. 204 204 */ 205 int205 errno_t 206 206 mfs_put_inode(struct mfs_node *mnode) 207 207 { 208 int rc = EOK;208 errno_t rc = EOK; 209 209 210 210 if (!mnode->ino_i->dirty) … … 223 223 } 224 224 225 static int225 static errno_t 226 226 mfs_write_inode_raw(struct mfs_node *mnode) 227 227 { 228 228 int i; 229 int r;229 errno_t r; 230 230 block_t *b; 231 231 struct mfs_ino_info *ino_i = mnode->ino_i; … … 267 267 } 268 268 269 static int269 static errno_t 270 270 mfs2_write_inode_raw(struct mfs_node *mnode) 271 271 { … … 274 274 block_t *b; 275 275 int i; 276 int r;276 errno_t r; 277 277 278 278 const uint32_t inum = ino_i->index - 1; … … 321 321 * @return EOK on success or an error code. 322 322 */ 323 int323 errno_t 324 324 mfs_inode_shrink(struct mfs_node *mnode, size_t size_shrink) 325 325 { … … 327 327 struct mfs_ino_info *ino_i = mnode->ino_i; 328 328 const size_t bs = sbi->block_size; 329 int r;329 errno_t r; 330 330 331 331 if (size_shrink == 0) { -
uspace/srv/fs/mfs/mfs_ops.c
rfacacc71 r46577995 41 41 static bool check_magic_number(uint16_t magic, bool *native, 42 42 mfs_version_t *version, bool *longfilenames); 43 static int mfs_node_core_get(fs_node_t **rfn, struct mfs_instance *inst,43 static errno_t mfs_node_core_get(fs_node_t **rfn, struct mfs_instance *inst, 44 44 fs_index_t index); 45 static int mfs_node_put(fs_node_t *fsnode);46 static int mfs_node_open(fs_node_t *fsnode);45 static errno_t mfs_node_put(fs_node_t *fsnode); 46 static errno_t mfs_node_open(fs_node_t *fsnode); 47 47 static fs_index_t mfs_index_get(fs_node_t *fsnode); 48 48 static unsigned mfs_lnkcnt_get(fs_node_t *fsnode); 49 49 static bool mfs_is_directory(fs_node_t *fsnode); 50 50 static bool mfs_is_file(fs_node_t *fsnode); 51 static int mfs_has_children(bool *has_children, fs_node_t *fsnode);52 static int mfs_root_get(fs_node_t **rfn, service_id_t service_id);51 static errno_t mfs_has_children(bool *has_children, fs_node_t *fsnode); 52 static errno_t mfs_root_get(fs_node_t **rfn, service_id_t service_id); 53 53 static service_id_t mfs_service_get(fs_node_t *fsnode); 54 54 static aoff64_t mfs_size_get(fs_node_t *node); 55 static int mfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component);56 static int mfs_create_node(fs_node_t **rfn, service_id_t service_id, int flags);57 static int mfs_link(fs_node_t *pfn, fs_node_t *cfn, const char *name);58 static int mfs_unlink(fs_node_t *, fs_node_t *, const char *name);59 static int mfs_destroy_node(fs_node_t *fn);60 static int mfs_node_get(fs_node_t **rfn, service_id_t service_id,55 static errno_t mfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component); 56 static errno_t mfs_create_node(fs_node_t **rfn, service_id_t service_id, int flags); 57 static errno_t mfs_link(fs_node_t *pfn, fs_node_t *cfn, const char *name); 58 static errno_t mfs_unlink(fs_node_t *, fs_node_t *, const char *name); 59 static errno_t mfs_destroy_node(fs_node_t *fn); 60 static errno_t mfs_node_get(fs_node_t **rfn, service_id_t service_id, 61 61 fs_index_t index); 62 static int mfs_instance_get(service_id_t service_id,62 static errno_t mfs_instance_get(service_id_t service_id, 63 63 struct mfs_instance **instance); 64 static int mfs_check_sanity(struct mfs_sb_info *sbi);64 static errno_t mfs_check_sanity(struct mfs_sb_info *sbi); 65 65 static bool is_power_of_two(uint32_t n); 66 static int mfs_size_block(service_id_t service_id, uint32_t *size);67 static int mfs_total_block_count(service_id_t service_id, uint64_t *count);68 static int mfs_free_block_count(service_id_t service_id, uint64_t *count);66 static errno_t mfs_size_block(service_id_t service_id, uint32_t *size); 67 static errno_t mfs_total_block_count(service_id_t service_id, uint64_t *count); 68 static errno_t mfs_free_block_count(service_id_t service_id, uint64_t *count); 69 69 70 70 static hash_table_t open_nodes; … … 131 131 }; 132 132 133 int133 errno_t 134 134 mfs_global_init(void) 135 135 { … … 142 142 /** Read the superblock. 143 143 */ 144 static int mfs_read_sb(service_id_t service_id, struct mfs_sb_info **rsbi)144 static errno_t mfs_read_sb(service_id_t service_id, struct mfs_sb_info **rsbi) 145 145 { 146 146 struct mfs_superblock *sb = NULL; … … 151 151 mfs_version_t version; 152 152 uint16_t magic; 153 int rc;153 errno_t rc; 154 154 155 155 /* Allocate space for generic MFS superblock */ … … 277 277 278 278 279 static int mfs_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)279 static errno_t mfs_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info) 280 280 { 281 281 struct mfs_sb_info *sbi = NULL; 282 int rc;282 errno_t rc; 283 283 284 284 /* Initialize libblock */ … … 294 294 } 295 295 296 static int296 static errno_t 297 297 mfs_mounted(service_id_t service_id, const char *opts, fs_index_t *index, 298 298 aoff64_t *size) … … 301 301 struct mfs_sb_info *sbi = NULL; 302 302 struct mfs_instance *instance = NULL; 303 int rc;303 errno_t rc; 304 304 305 305 /* Check for option enabling write through. */ … … 365 365 } 366 366 367 static int367 static errno_t 368 368 mfs_unmounted(service_id_t service_id) 369 369 { … … 372 372 mfsdebug("%s()\n", __FUNCTION__); 373 373 374 int r = mfs_instance_get(service_id, &inst);374 errno_t r = mfs_instance_get(service_id, &inst); 375 375 if (r != EOK) 376 376 return r; … … 396 396 } 397 397 398 static int398 static errno_t 399 399 mfs_create_node(fs_node_t **rfn, service_id_t service_id, int flags) 400 400 { 401 int r;401 errno_t r; 402 402 struct mfs_instance *inst; 403 403 struct mfs_node *mnode; … … 483 483 } 484 484 485 static int485 static errno_t 486 486 mfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component) 487 487 { … … 489 489 struct mfs_ino_info *ino_i = mnode->ino_i; 490 490 struct mfs_dentry_info d_info; 491 int r;491 errno_t r; 492 492 493 493 if (!S_ISDIR(ino_i->i_mode)) … … 530 530 } 531 531 532 static int532 static errno_t 533 533 mfs_node_get(fs_node_t **rfn, service_id_t service_id, 534 534 fs_index_t index) 535 535 { 536 int rc;536 errno_t rc; 537 537 struct mfs_instance *instance; 538 538 … … 544 544 } 545 545 546 static int546 static errno_t 547 547 mfs_node_put(fs_node_t *fsnode) 548 548 { 549 int rc = EOK;549 errno_t rc = EOK; 550 550 struct mfs_node *mnode = fsnode->data; 551 551 … … 568 568 } 569 569 570 static int570 static errno_t 571 571 mfs_node_open(fs_node_t *fsnode) 572 572 { … … 601 601 } 602 602 603 static int603 static errno_t 604 604 mfs_node_core_get(fs_node_t **rfn, struct mfs_instance *inst, 605 605 fs_index_t index) … … 607 607 fs_node_t *node = NULL; 608 608 struct mfs_node *mnode = NULL; 609 int rc;609 errno_t rc; 610 610 611 611 fibril_mutex_lock(&open_nodes_lock); … … 688 688 } 689 689 690 static int690 static errno_t 691 691 mfs_root_get(fs_node_t **rfn, service_id_t service_id) 692 692 { 693 int rc = mfs_node_get(rfn, service_id, MFS_ROOT_INO);693 errno_t rc = mfs_node_get(rfn, service_id, MFS_ROOT_INO); 694 694 return rc; 695 695 } 696 696 697 static int697 static errno_t 698 698 mfs_link(fs_node_t *pfn, fs_node_t *cfn, const char *name) 699 699 { … … 706 706 return ENAMETOOLONG; 707 707 708 int r = mfs_insert_dentry(parent, name, child->ino_i->index);708 errno_t r = mfs_insert_dentry(parent, name, child->ino_i->index); 709 709 if (r != EOK) 710 710 return r; … … 736 736 exit: 737 737 if (destroy_dentry) { 738 int r2 = mfs_remove_dentry(parent, name);738 errno_t r2 = mfs_remove_dentry(parent, name); 739 739 if (r2 != EOK) 740 740 r = r2; … … 746 746 } 747 747 748 static int748 static errno_t 749 749 mfs_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *name) 750 750 { … … 752 752 struct mfs_node *child = cfn->data; 753 753 bool has_children; 754 int r;754 errno_t r; 755 755 756 756 if (!parent) … … 787 787 } 788 788 789 static int789 static errno_t 790 790 mfs_has_children(bool *has_children, fs_node_t *fsnode) 791 791 { 792 792 struct mfs_node *mnode = fsnode->data; 793 793 struct mfs_sb_info *sbi = mnode->instance->sbi; 794 int r;794 errno_t r; 795 795 796 796 *has_children = false; … … 819 819 } 820 820 821 static int821 static errno_t 822 822 mfs_read(service_id_t service_id, fs_index_t index, aoff64_t pos, 823 823 size_t *rbytes) 824 824 { 825 int rc;825 errno_t rc; 826 826 fs_node_t *fn = NULL; 827 827 … … 926 926 out_error: 927 927 ; 928 int tmp = mfs_node_put(fn);928 errno_t tmp = mfs_node_put(fn); 929 929 async_answer_0(callid, tmp != EOK ? tmp : rc); 930 930 return tmp != EOK ? tmp : rc; 931 931 } 932 932 933 static int933 static errno_t 934 934 mfs_write(service_id_t service_id, fs_index_t index, aoff64_t pos, 935 935 size_t *wbytes, aoff64_t *nsize) 936 936 { 937 937 fs_node_t *fn; 938 int r;938 errno_t r; 939 939 int flags = BLOCK_FLAGS_NONE; 940 940 … … 1015 1015 } 1016 1016 1017 static int1017 static errno_t 1018 1018 mfs_destroy(service_id_t service_id, fs_index_t index) 1019 1019 { 1020 1020 fs_node_t *fn = NULL; 1021 int r;1021 errno_t r; 1022 1022 1023 1023 r = mfs_node_get(&fn, service_id, index); … … 1031 1031 } 1032 1032 1033 static int1033 static errno_t 1034 1034 mfs_destroy_node(fs_node_t *fn) 1035 1035 { 1036 1036 struct mfs_node *mnode = fn->data; 1037 1037 bool has_children; 1038 int r;1038 errno_t r; 1039 1039 1040 1040 mfsdebug("mfs_destroy_node %d\n", mnode->ino_i->index); … … 1059 1059 } 1060 1060 1061 static int1061 static errno_t 1062 1062 mfs_truncate(service_id_t service_id, fs_index_t index, aoff64_t size) 1063 1063 { 1064 1064 fs_node_t *fn; 1065 int r;1065 errno_t r; 1066 1066 1067 1067 r = mfs_node_get(&fn, service_id, index); … … 1083 1083 } 1084 1084 1085 static int1085 static errno_t 1086 1086 mfs_instance_get(service_id_t service_id, struct mfs_instance **instance) 1087 1087 { 1088 1088 void *data; 1089 int rc;1089 errno_t rc; 1090 1090 1091 1091 rc = fs_instance_get(service_id, &data); … … 1135 1135 * @return EOK on success, ENOTSUP otherwise. 1136 1136 */ 1137 static int1137 static errno_t 1138 1138 mfs_check_sanity(struct mfs_sb_info *sbi) 1139 1139 { … … 1152 1152 } 1153 1153 1154 static int1154 static errno_t 1155 1155 mfs_close(service_id_t service_id, fs_index_t index) 1156 1156 { … … 1158 1158 } 1159 1159 1160 static int1160 static errno_t 1161 1161 mfs_sync(service_id_t service_id, fs_index_t index) 1162 1162 { 1163 1163 fs_node_t *fn = NULL; 1164 int rc = mfs_node_get(&fn, service_id, index);1164 errno_t rc = mfs_node_get(&fn, service_id, index); 1165 1165 if (rc != EOK) 1166 1166 return rc; … … 1189 1189 } 1190 1190 1191 static int1191 static errno_t 1192 1192 mfs_size_block(service_id_t service_id, uint32_t *size) 1193 1193 { 1194 1194 struct mfs_instance *inst; 1195 int rc;1195 errno_t rc; 1196 1196 1197 1197 rc = mfs_instance_get(service_id, &inst); … … 1207 1207 } 1208 1208 1209 static int1209 static errno_t 1210 1210 mfs_total_block_count(service_id_t service_id, uint64_t *count) 1211 1211 { 1212 1212 struct mfs_instance *inst; 1213 int rc;1213 errno_t rc; 1214 1214 1215 1215 rc = mfs_instance_get(service_id, &inst); … … 1225 1225 } 1226 1226 1227 static int1227 static errno_t 1228 1228 mfs_free_block_count(service_id_t service_id, uint64_t *count) 1229 1229 { … … 1231 1231 1232 1232 struct mfs_instance *inst; 1233 int rc = mfs_instance_get(service_id, &inst);1233 errno_t rc = mfs_instance_get(service_id, &inst); 1234 1234 if (rc != EOK) 1235 1235 return rc; -
uspace/srv/fs/mfs/mfs_rw.c
rfacacc71 r46577995 34 34 #include "mfs.h" 35 35 36 static int36 static errno_t 37 37 rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock, 38 38 bool write_mode, uint32_t w_block); 39 39 40 static int40 static errno_t 41 41 reset_zone_content(struct mfs_instance *inst, uint32_t zone); 42 42 43 static int43 static errno_t 44 44 alloc_zone_and_clear(struct mfs_instance *inst, uint32_t *zone); 45 45 46 static int46 static errno_t 47 47 read_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t **ind_zone); 48 48 49 static int49 static errno_t 50 50 write_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t *ind_zone); 51 51 … … 61 61 * @return EOK on success or an error code. 62 62 */ 63 int63 errno_t 64 64 mfs_read_map(uint32_t *b, const struct mfs_node *mnode, uint32_t pos) 65 65 { 66 int r;66 errno_t r; 67 67 const struct mfs_sb_info *sbi = mnode->instance->sbi; 68 68 const int block_size = sbi->block_size; … … 83 83 } 84 84 85 int85 errno_t 86 86 mfs_write_map(struct mfs_node *mnode, const uint32_t pos, uint32_t new_zone, 87 87 uint32_t *old_zone) … … 100 100 } 101 101 102 static int102 static errno_t 103 103 rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock, 104 104 bool write_mode, uint32_t w_block) … … 107 107 int ptrs_per_block; 108 108 uint32_t *ind_zone = NULL, *ind2_zone = NULL; 109 int r = EOK;109 errno_t r = EOK; 110 110 111 111 struct mfs_ino_info *ino_i = mnode->ino_i; … … 238 238 * @return EOK on success or an error code. 239 239 */ 240 int240 errno_t 241 241 mfs_prune_ind_zones(struct mfs_node *mnode, size_t new_size) 242 242 { … … 245 245 struct mfs_ino_info *ino_i = mnode->ino_i; 246 246 int nr_direct, ptrs_per_block, rblock; 247 int r;247 errno_t r; 248 248 int i; 249 249 … … 312 312 } 313 313 314 static int314 static errno_t 315 315 reset_zone_content(struct mfs_instance *inst, uint32_t zone) 316 316 { 317 317 block_t *b; 318 int r;318 errno_t r; 319 319 320 320 r = block_get(&b, inst->service_id, zone, BLOCK_FLAGS_NOREAD); … … 328 328 } 329 329 330 static int330 static errno_t 331 331 alloc_zone_and_clear(struct mfs_instance *inst, uint32_t *zone) 332 332 { 333 int r;333 errno_t r; 334 334 335 335 r = mfs_alloc_zone(inst, zone); … … 341 341 } 342 342 343 static int343 static errno_t 344 344 read_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t **ind_zone) 345 345 { 346 346 struct mfs_sb_info *sbi = inst->sbi; 347 int r;347 errno_t r; 348 348 unsigned i; 349 349 block_t *b; … … 376 376 } 377 377 378 static int378 static errno_t 379 379 write_ind_zone(struct mfs_instance *inst, uint32_t zone, uint32_t *ind_zone) 380 380 { 381 381 struct mfs_sb_info *sbi = inst->sbi; 382 int r;382 errno_t r; 383 383 unsigned i; 384 384 block_t *b; -
uspace/srv/fs/tmpfs/tmpfs.c
rfacacc71 r46577995 88 88 } 89 89 90 int rc = fs_register(vfs_sess, &tmpfs_vfs_info, &tmpfs_ops,90 errno_t rc = fs_register(vfs_sess, &tmpfs_vfs_info, &tmpfs_ops, 91 91 &tmpfs_libfs_ops); 92 92 if (rc != EOK) { -
uspace/srv/fs/tmpfs/tmpfs_dump.c
rfacacc71 r46577995 63 63 struct rdentry entry; 64 64 libfs_ops_t *ops = &tmpfs_libfs_ops; 65 int rc;65 errno_t rc; 66 66 67 67 do { … … 168 168 libfs_ops_t *ops = &tmpfs_libfs_ops; 169 169 fs_node_t *fn; 170 int rc;170 errno_t rc; 171 171 172 172 rc = block_init(dsid, TMPFS_COMM_SIZE); -
uspace/srv/fs/tmpfs/tmpfs_ops.c
rfacacc71 r46577995 64 64 65 65 /* Forward declarations of static functions. */ 66 static int tmpfs_match(fs_node_t **, fs_node_t *, const char *);67 static int tmpfs_node_get(fs_node_t **, service_id_t, fs_index_t);68 static int tmpfs_node_open(fs_node_t *);69 static int tmpfs_node_put(fs_node_t *);70 static int tmpfs_create_node(fs_node_t **, service_id_t, int);71 static int tmpfs_destroy_node(fs_node_t *);72 static int tmpfs_link_node(fs_node_t *, fs_node_t *, const char *);73 static int tmpfs_unlink_node(fs_node_t *, fs_node_t *, const char *);66 static errno_t tmpfs_match(fs_node_t **, fs_node_t *, const char *); 67 static errno_t tmpfs_node_get(fs_node_t **, service_id_t, fs_index_t); 68 static errno_t tmpfs_node_open(fs_node_t *); 69 static errno_t tmpfs_node_put(fs_node_t *); 70 static errno_t tmpfs_create_node(fs_node_t **, service_id_t, int); 71 static errno_t tmpfs_destroy_node(fs_node_t *); 72 static errno_t tmpfs_link_node(fs_node_t *, fs_node_t *, const char *); 73 static errno_t tmpfs_unlink_node(fs_node_t *, fs_node_t *, const char *); 74 74 75 75 /* Implementation of helper functions. */ 76 static int tmpfs_root_get(fs_node_t **rfn, service_id_t service_id)76 static errno_t tmpfs_root_get(fs_node_t **rfn, service_id_t service_id) 77 77 { 78 78 return tmpfs_node_get(rfn, service_id, TMPFS_SOME_ROOT); 79 79 } 80 80 81 static int tmpfs_has_children(bool *has_children, fs_node_t *fn)81 static errno_t tmpfs_has_children(bool *has_children, fs_node_t *fn) 82 82 { 83 83 *has_children = !list_empty(&TMPFS_NODE(fn)->cs_list); … … 227 227 { 228 228 fs_node_t *rfn; 229 int rc;229 errno_t rc; 230 230 231 231 rc = tmpfs_create_node(&rfn, service_id, L_DIRECTORY); … … 252 252 } 253 253 254 int tmpfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component)254 errno_t tmpfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component) 255 255 { 256 256 tmpfs_node_t *parentp = TMPFS_NODE(pfn); … … 267 267 } 268 268 269 int tmpfs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index)269 errno_t tmpfs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index) 270 270 { 271 271 node_key_t key = { … … 286 286 } 287 287 288 int tmpfs_node_open(fs_node_t *fn)288 errno_t tmpfs_node_open(fs_node_t *fn) 289 289 { 290 290 /* nothing to do */ … … 292 292 } 293 293 294 int tmpfs_node_put(fs_node_t *fn)294 errno_t tmpfs_node_put(fs_node_t *fn) 295 295 { 296 296 /* nothing to do */ … … 298 298 } 299 299 300 int tmpfs_create_node(fs_node_t **rfn, service_id_t service_id, int lflag)300 errno_t tmpfs_create_node(fs_node_t **rfn, service_id_t service_id, int lflag) 301 301 { 302 302 fs_node_t *rootfn; 303 int rc;303 errno_t rc; 304 304 305 305 assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY)); … … 335 335 } 336 336 337 int tmpfs_destroy_node(fs_node_t *fn)337 errno_t tmpfs_destroy_node(fs_node_t *fn) 338 338 { 339 339 tmpfs_node_t *nodep = TMPFS_NODE(fn); … … 351 351 } 352 352 353 int tmpfs_link_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm)353 errno_t tmpfs_link_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm) 354 354 { 355 355 tmpfs_node_t *parentp = TMPFS_NODE(pfn); … … 386 386 } 387 387 388 int tmpfs_unlink_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm)388 errno_t tmpfs_unlink_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm) 389 389 { 390 390 tmpfs_node_t *parentp = TMPFS_NODE(pfn); … … 421 421 */ 422 422 423 static int tmpfs_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)423 static errno_t tmpfs_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info) 424 424 { 425 425 return ENOTSUP; 426 426 } 427 427 428 static int428 static errno_t 429 429 tmpfs_mounted(service_id_t service_id, const char *opts, fs_index_t *index, 430 430 aoff64_t *size) 431 431 { 432 432 fs_node_t *rootfn; 433 int rc;433 errno_t rc; 434 434 435 435 /* Check if this device is not already mounted. */ … … 458 458 } 459 459 460 static int tmpfs_unmounted(service_id_t service_id)460 static errno_t tmpfs_unmounted(service_id_t service_id) 461 461 { 462 462 tmpfs_instance_done(service_id); … … 464 464 } 465 465 466 static int tmpfs_read(service_id_t service_id, fs_index_t index, aoff64_t pos,466 static errno_t tmpfs_read(service_id_t service_id, fs_index_t index, aoff64_t pos, 467 467 size_t *rbytes) 468 468 { … … 525 525 } 526 526 527 static int527 static errno_t 528 528 tmpfs_write(service_id_t service_id, fs_index_t index, aoff64_t pos, 529 529 size_t *wbytes, aoff64_t *nsize) … … 589 589 } 590 590 591 static int tmpfs_truncate(service_id_t service_id, fs_index_t index,591 static errno_t tmpfs_truncate(service_id_t service_id, fs_index_t index, 592 592 aoff64_t size) 593 593 { … … 626 626 } 627 627 628 static int tmpfs_close(service_id_t service_id, fs_index_t index)629 { 630 return EOK; 631 } 632 633 static int tmpfs_destroy(service_id_t service_id, fs_index_t index)628 static errno_t tmpfs_close(service_id_t service_id, fs_index_t index) 629 { 630 return EOK; 631 } 632 633 static errno_t tmpfs_destroy(service_id_t service_id, fs_index_t index) 634 634 { 635 635 node_key_t key = { … … 646 646 } 647 647 648 static int tmpfs_sync(service_id_t service_id, fs_index_t index)648 static errno_t tmpfs_sync(service_id_t service_id, fs_index_t index) 649 649 { 650 650 /* -
uspace/srv/fs/udf/udf.c
rfacacc71 r46577995 81 81 } 82 82 83 int rc = fs_register(vfs_sess, &udf_vfs_info, &udf_ops,83 errno_t rc = fs_register(vfs_sess, &udf_vfs_info, &udf_ops, 84 84 &udf_libfs_ops); 85 85 if (rc != EOK) -
uspace/srv/fs/udf/udf_file.c
rfacacc71 r46577995 57 57 * 58 58 */ 59 static int udf_read_extended_allocator(udf_node_t *node, uint16_t icb_flag,59 static errno_t udf_read_extended_allocator(udf_node_t *node, uint16_t icb_flag, 60 60 uint32_t pos) 61 61 { 62 62 block_t *block = NULL; 63 int rc = block_get(&block, node->instance->service_id, pos,63 errno_t rc = block_get(&block, node->instance->service_id, pos, 64 64 BLOCK_FLAGS_NONE); 65 65 if (rc != EOK) … … 93 93 * 94 94 */ 95 int udf_read_allocation_sequence(udf_node_t *node, uint8_t *af,95 errno_t udf_read_allocation_sequence(udf_node_t *node, uint8_t *af, 96 96 uint16_t icb_flag, uint32_t start_alloc, uint32_t len) 97 97 { … … 233 233 * @return EOK on success or an error code. 234 234 */ 235 int udf_read_icb(udf_node_t *node)235 errno_t udf_read_icb(udf_node_t *node) 236 236 { 237 237 while (true) { … … 239 239 240 240 block_t *block = NULL; 241 int rc = block_get(&block, node->instance->service_id, pos,241 errno_t rc = block_get(&block, node->instance->service_id, pos, 242 242 BLOCK_FLAGS_NONE); 243 243 if (rc != EOK) … … 303 303 * 304 304 */ 305 int udf_node_get_core(udf_node_t *node)305 errno_t udf_node_get_core(udf_node_t *node) 306 306 { 307 307 node->link_cnt = 1; … … 318 318 * 319 319 */ 320 static int udf_get_fid_in_data(udf_file_identifier_descriptor_t **fid,320 static errno_t udf_get_fid_in_data(udf_file_identifier_descriptor_t **fid, 321 321 udf_node_t *node, aoff64_t pos) 322 322 { … … 369 369 * 370 370 */ 371 int udf_get_fid(udf_file_identifier_descriptor_t **fid, block_t **block,371 errno_t udf_get_fid(udf_file_identifier_descriptor_t **fid, block_t **block, 372 372 udf_node_t *node, aoff64_t pos) 373 373 { … … 388 388 * 389 389 */ 390 int udf_get_fid_in_allocator(udf_file_identifier_descriptor_t **fid,390 errno_t udf_get_fid_in_allocator(udf_file_identifier_descriptor_t **fid, 391 391 block_t **block, udf_node_t *node, aoff64_t pos) 392 392 { … … 402 402 size_t i = 0; 403 403 while (i * node->instance->sector_size < node->allocators[j].length) { 404 int rc = block_get(block, node->instance->service_id,404 errno_t rc = block_get(block, node->instance->service_id, 405 405 node->allocators[j].position + i, BLOCK_FLAGS_NONE); 406 406 if (rc != EOK) { … … 469 469 * 470 470 */ 471 int udf_get_fid_in_sector(udf_file_identifier_descriptor_t **fid,471 errno_t udf_get_fid_in_sector(udf_file_identifier_descriptor_t **fid, 472 472 block_t **block, udf_node_t *node, aoff64_t pos, size_t *n, void **buf, 473 473 size_t *len) … … 576 576 * 577 577 */ 578 int udf_read_file(size_t *read_len, ipc_callid_t callid, udf_node_t *node,578 errno_t udf_read_file(size_t *read_len, ipc_callid_t callid, udf_node_t *node, 579 579 aoff64_t pos, size_t len) 580 580 { … … 594 594 595 595 block_t *block = NULL; 596 int rc = block_get(&block, node->instance->service_id,596 errno_t rc = block_get(&block, node->instance->service_id, 597 597 node->allocators[i].position + (sector_num - sector_cnt), 598 598 BLOCK_FLAGS_NONE); -
uspace/srv/fs/udf/udf_file.h
rfacacc71 r46577995 194 194 }__attribute__((packed)) udf_space_bitmap_descriptor_t; 195 195 196 extern int udf_node_get_core(udf_node_t *);197 extern int udf_read_icb(udf_node_t *);198 extern int udf_read_allocation_sequence(udf_node_t *, uint8_t *, uint16_t,196 extern errno_t udf_node_get_core(udf_node_t *); 197 extern errno_t udf_read_icb(udf_node_t *); 198 extern errno_t udf_read_allocation_sequence(udf_node_t *, uint8_t *, uint16_t, 199 199 uint32_t, uint32_t); 200 extern int udf_read_file(size_t *, ipc_callid_t, udf_node_t *, aoff64_t,200 extern errno_t udf_read_file(size_t *, ipc_callid_t, udf_node_t *, aoff64_t, 201 201 size_t); 202 extern int udf_get_fid(udf_file_identifier_descriptor_t **, block_t **,202 extern errno_t udf_get_fid(udf_file_identifier_descriptor_t **, block_t **, 203 203 udf_node_t *, aoff64_t); 204 extern int udf_get_fid_in_allocator(udf_file_identifier_descriptor_t **,204 extern errno_t udf_get_fid_in_allocator(udf_file_identifier_descriptor_t **, 205 205 block_t **, udf_node_t *, aoff64_t); 206 extern int udf_get_fid_in_sector(udf_file_identifier_descriptor_t **,206 extern errno_t udf_get_fid_in_sector(udf_file_identifier_descriptor_t **, 207 207 block_t **, udf_node_t *, aoff64_t, size_t *, void **, size_t *); 208 208 -
uspace/srv/fs/udf/udf_idx.c
rfacacc71 r46577995 91 91 * 92 92 */ 93 int udf_idx_init(void)93 errno_t udf_idx_init(void) 94 94 { 95 95 if (!hash_table_create(&udf_idx, 0, 0, &udf_idx_ops)) … … 104 104 * 105 105 */ 106 int udf_idx_fini(void)106 errno_t udf_idx_fini(void) 107 107 { 108 108 hash_table_destroy(&udf_idx); … … 119 119 * 120 120 */ 121 int udf_idx_get(udf_node_t **udfn, udf_instance_t *instance, fs_index_t index)121 errno_t udf_idx_get(udf_node_t **udfn, udf_instance_t *instance, fs_index_t index) 122 122 { 123 123 fibril_mutex_lock(&udf_idx_lock); … … 153 153 * 154 154 */ 155 int udf_idx_add(udf_node_t **udfn, udf_instance_t *instance, fs_index_t index)155 errno_t udf_idx_add(udf_node_t **udfn, udf_instance_t *instance, fs_index_t index) 156 156 { 157 157 fibril_mutex_lock(&udf_idx_lock); … … 199 199 * 200 200 */ 201 int udf_idx_del(udf_node_t *node)201 errno_t udf_idx_del(udf_node_t *node) 202 202 { 203 203 assert(node->ref_cnt == 0); -
uspace/srv/fs/udf/udf_idx.h
rfacacc71 r46577995 36 36 #include "udf.h" 37 37 38 extern int udf_idx_init(void);39 extern int udf_idx_fini(void);40 extern int udf_idx_get(udf_node_t **, udf_instance_t *, fs_index_t);41 extern int udf_idx_add(udf_node_t **, udf_instance_t *, fs_index_t);42 extern int udf_idx_del(udf_node_t *);38 extern errno_t udf_idx_init(void); 39 extern errno_t udf_idx_fini(void); 40 extern errno_t udf_idx_get(udf_node_t **, udf_instance_t *, fs_index_t); 41 extern errno_t udf_idx_add(udf_node_t **, udf_instance_t *, fs_index_t); 42 extern errno_t udf_idx_del(udf_node_t *); 43 43 44 44 #endif /* UDF_IDX_H_ */ -
uspace/srv/fs/udf/udf_ops.c
rfacacc71 r46577995 68 68 static LIST_INITIALIZE(ffn_list); 69 69 70 static int udf_node_get(fs_node_t **rfn, service_id_t service_id,70 static errno_t udf_node_get(fs_node_t **rfn, service_id_t service_id, 71 71 fs_index_t index) 72 72 { 73 73 udf_instance_t *instance; 74 int rc = fs_instance_get(service_id, (void **) &instance);74 errno_t rc = fs_instance_get(service_id, (void **) &instance); 75 75 if (rc != EOK) 76 76 return rc; … … 94 94 } 95 95 96 static int udf_root_get(fs_node_t **rfn, service_id_t service_id)96 static errno_t udf_root_get(fs_node_t **rfn, service_id_t service_id) 97 97 { 98 98 udf_instance_t *instance; 99 int rc = fs_instance_get(service_id, (void **) &instance);99 errno_t rc = fs_instance_get(service_id, (void **) &instance); 100 100 if (rc != EOK) 101 101 return rc; … … 114 114 } 115 115 116 static int udf_match(fs_node_t **rfn, fs_node_t *pfn, const char *component)116 static errno_t udf_match(fs_node_t **rfn, fs_node_t *pfn, const char *component) 117 117 { 118 118 char *name = malloc(MAX_FILE_NAME_LEN + 1); … … 132 132 133 133 if (str_casecmp(name, component) == 0) { 134 int rc = udf_node_get(rfn, udf_service_get(pfn),134 errno_t rc = udf_node_get(rfn, udf_service_get(pfn), 135 135 udf_long_ad_to_pos(UDF_NODE(pfn)->instance, &long_ad)); 136 136 … … 143 143 144 144 if (block != NULL) { 145 int rc = block_put(block);145 errno_t rc = block_put(block); 146 146 if (rc != EOK) 147 147 return rc; … … 155 155 } 156 156 157 static int udf_node_open(fs_node_t *fn)158 { 159 return EOK; 160 } 161 162 static int udf_node_put(fs_node_t *fn)157 static errno_t udf_node_open(fs_node_t *fn) 158 { 159 return EOK; 160 } 161 162 static errno_t udf_node_put(fs_node_t *fn) 163 163 { 164 164 udf_node_t *node = UDF_NODE(fn); … … 177 177 } 178 178 179 static int udf_create_node(fs_node_t **rfn, service_id_t service_id, int flags)180 { 181 return ENOTSUP; 182 } 183 184 static int udf_destroy_node(fs_node_t *fn)185 { 186 return ENOTSUP; 187 } 188 189 static int udf_link(fs_node_t *pfn, fs_node_t *cfn, const char *name)190 { 191 return ENOTSUP; 192 } 193 194 static int udf_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *nm)195 { 196 return ENOTSUP; 197 } 198 199 static int udf_has_children(bool *has_children, fs_node_t *fn)179 static errno_t udf_create_node(fs_node_t **rfn, service_id_t service_id, int flags) 180 { 181 return ENOTSUP; 182 } 183 184 static errno_t udf_destroy_node(fs_node_t *fn) 185 { 186 return ENOTSUP; 187 } 188 189 static errno_t udf_link(fs_node_t *pfn, fs_node_t *cfn, const char *name) 190 { 191 return ENOTSUP; 192 } 193 194 static errno_t udf_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *nm) 195 { 196 return ENOTSUP; 197 } 198 199 static errno_t udf_has_children(bool *has_children, fs_node_t *fn) 200 200 { 201 201 *has_children = true; … … 248 248 } 249 249 250 static int udf_size_block(service_id_t service_id, uint32_t *size)250 static errno_t udf_size_block(service_id_t service_id, uint32_t *size) 251 251 { 252 252 udf_instance_t *instance; 253 int rc = fs_instance_get(service_id, (void **) &instance);253 errno_t rc = fs_instance_get(service_id, (void **) &instance); 254 254 if (rc != EOK) 255 255 return rc; … … 263 263 } 264 264 265 static int udf_total_block_count(service_id_t service_id, uint64_t *count)265 static errno_t udf_total_block_count(service_id_t service_id, uint64_t *count) 266 266 { 267 267 *count = 0; … … 270 270 } 271 271 272 static int udf_free_block_count(service_id_t service_id, uint64_t *count)272 static errno_t udf_free_block_count(service_id_t service_id, uint64_t *count) 273 273 { 274 274 *count = 0; … … 299 299 }; 300 300 301 static int udf_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)302 { 303 return ENOTSUP; 304 } 305 306 static int udf_mounted(service_id_t service_id, const char *opts,301 static errno_t udf_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info) 302 { 303 return ENOTSUP; 304 } 305 306 static errno_t udf_mounted(service_id_t service_id, const char *opts, 307 307 fs_index_t *index, aoff64_t *size) 308 308 { … … 330 330 331 331 /* initialize block cache */ 332 int rc = block_init(service_id, MAX_SIZE);332 errno_t rc = block_init(service_id, MAX_SIZE); 333 333 if (rc != EOK) 334 334 return rc; … … 415 415 } 416 416 417 static int udf_unmounted(service_id_t service_id)417 static errno_t udf_unmounted(service_id_t service_id) 418 418 { 419 419 fs_node_t *fn; 420 int rc = udf_root_get(&fn, service_id);420 errno_t rc = udf_root_get(&fn, service_id); 421 421 if (rc != EOK) 422 422 return rc; … … 449 449 } 450 450 451 static int udf_read(service_id_t service_id, fs_index_t index, aoff64_t pos,451 static errno_t udf_read(service_id_t service_id, fs_index_t index, aoff64_t pos, 452 452 size_t *rbytes) 453 453 { 454 454 udf_instance_t *instance; 455 int rc = fs_instance_get(service_id, (void **) &instance);455 errno_t rc = fs_instance_get(service_id, (void **) &instance); 456 456 if (rc != EOK) 457 457 return rc; … … 523 523 } 524 524 525 static int udf_close(service_id_t service_id, fs_index_t index)526 { 527 return EOK; 528 } 529 530 static int udf_sync(service_id_t service_id, fs_index_t index)531 { 532 return ENOTSUP; 533 } 534 535 static int udf_write(service_id_t service_id, fs_index_t index, aoff64_t pos,525 static errno_t udf_close(service_id_t service_id, fs_index_t index) 526 { 527 return EOK; 528 } 529 530 static errno_t udf_sync(service_id_t service_id, fs_index_t index) 531 { 532 return ENOTSUP; 533 } 534 535 static errno_t udf_write(service_id_t service_id, fs_index_t index, aoff64_t pos, 536 536 size_t *wbytes, aoff64_t *nsize) 537 537 { … … 539 539 } 540 540 541 static int udf_truncate(service_id_t service_id, fs_index_t index,541 static errno_t udf_truncate(service_id_t service_id, fs_index_t index, 542 542 aoff64_t size) 543 543 { … … 545 545 } 546 546 547 static int udf_destroy(service_id_t service_id, fs_index_t index)547 static errno_t udf_destroy(service_id_t service_id, fs_index_t index) 548 548 { 549 549 return ENOTSUP; -
uspace/srv/fs/udf/udf_volume.c
rfacacc71 r46577995 84 84 * 85 85 */ 86 static int udf_volume_recongnition_structure_test(service_id_t service_id,86 static errno_t udf_volume_recongnition_structure_test(service_id_t service_id, 87 87 aoff64_t addr, udf_vrs_descriptor_t *vd) 88 88 { … … 100 100 * @return EOK on success or an error code. 101 101 */ 102 int udf_volume_recongnition(service_id_t service_id)102 errno_t udf_volume_recongnition(service_id_t service_id) 103 103 { 104 104 aoff64_t addr = VRS_ADDR; … … 109 109 return ENOMEM; 110 110 111 int rc = udf_volume_recongnition_structure_test(service_id, addr, vd);111 errno_t rc = udf_volume_recongnition_structure_test(service_id, addr, vd); 112 112 if (rc != EOK) { 113 113 free(vd); … … 170 170 * 171 171 */ 172 static int udf_get_anchor_volume_descriptor_by_ssize(service_id_t service_id,172 static errno_t udf_get_anchor_volume_descriptor_by_ssize(service_id_t service_id, 173 173 udf_anchor_volume_descriptor_t *avd, uint32_t sector_size) 174 174 { 175 int rc = block_read_bytes_direct(service_id,175 errno_t rc = block_read_bytes_direct(service_id, 176 176 UDF_AVDP_SECTOR * sector_size, 177 177 sizeof(udf_anchor_volume_descriptor_t), avd); … … 207 207 * 208 208 */ 209 int udf_get_anchor_volume_descriptor(service_id_t service_id,209 errno_t udf_get_anchor_volume_descriptor(service_id_t service_id, 210 210 udf_anchor_volume_descriptor_t *avd) 211 211 { … … 213 213 214 214 udf_instance_t *instance; 215 int rc = fs_instance_get(service_id, (void **) &instance);215 errno_t rc = fs_instance_get(service_id, (void **) &instance); 216 216 if (rc != EOK) 217 217 return rc; … … 360 360 * 361 361 */ 362 static int udf_read_virtual_partition(udf_instance_t *instance, uint32_t pos,362 static errno_t udf_read_virtual_partition(udf_instance_t *instance, uint32_t pos, 363 363 uint32_t id) 364 364 { 365 365 block_t *block = NULL; 366 int rc = block_get(&block, instance->service_id, pos,366 errno_t rc = block_get(&block, instance->service_id, pos, 367 367 BLOCK_FLAGS_NONE); 368 368 if (rc != EOK) … … 441 441 * 442 442 */ 443 static int udf_fill_volume_info(udf_logical_volume_descriptor_t *lvd,443 static errno_t udf_fill_volume_info(udf_logical_volume_descriptor_t *lvd, 444 444 size_t lvd_cnt, udf_partition_descriptor_t *pd, size_t pd_cnt, 445 445 udf_instance_t *instance) … … 553 553 instance->partitions[j].number = 554 554 FLE16(metadata->partition_number); 555 int rc = udf_read_virtual_partition(instance,555 errno_t rc = udf_read_virtual_partition(instance, 556 556 FLE32(metadata->metadata_fileloc) + 557 557 FLE32(pd[pd_num].starting_location), j); … … 601 601 * 602 602 */ 603 int udf_read_volume_descriptor_sequence(service_id_t service_id,603 errno_t udf_read_volume_descriptor_sequence(service_id_t service_id, 604 604 udf_extent_t addr) 605 605 { 606 606 udf_instance_t *instance; 607 int rc = fs_instance_get(service_id, (void **) &instance);607 errno_t rc = fs_instance_get(service_id, (void **) &instance); 608 608 if (rc != EOK) 609 609 return rc; -
uspace/srv/fs/udf/udf_volume.h
rfacacc71 r46577995 212 212 } __attribute__((packed)) udf_partition_header_descriptor_t; 213 213 214 extern int udf_volume_recongnition(service_id_t);215 extern int udf_get_anchor_volume_descriptor(service_id_t,214 extern errno_t udf_volume_recongnition(service_id_t); 215 extern errno_t udf_get_anchor_volume_descriptor(service_id_t, 216 216 udf_anchor_volume_descriptor_t *); 217 extern int udf_read_volume_descriptor_sequence(service_id_t, udf_extent_t);217 extern errno_t udf_read_volume_descriptor_sequence(service_id_t, udf_extent_t); 218 218 extern fs_index_t udf_long_ad_to_pos(udf_instance_t *, udf_long_ad_t *); 219 219
Note:
See TracChangeset
for help on using the changeset viewer.