Changes in uspace/srv/fs/fat/fat_ops.c [dba4a23:69a60c4] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/fs/fat/fat_ops.c
rdba4a23 r69a60c4 60 60 #define FS_NODE(node) ((node) ? (node)->bp : NULL) 61 61 62 #define DPS(bs) (BPS((bs)) / sizeof(fat_dentry_t))63 #define BPC(bs) (BPS((bs)) * SPC((bs)))64 65 62 /** Mutex protecting the list of cached free FAT nodes. */ 66 63 static FIBRIL_MUTEX_INITIALIZE(ffn_mutex); … … 104 101 node->refcnt = 0; 105 102 node->dirty = false; 106 node->lastc_cached_valid = false;107 node->lastc_cached_value = FAT_CLST_LAST1;108 node->currc_cached_valid = false;109 node->currc_cached_bn = 0;110 node->currc_cached_value = FAT_CLST_LAST1;111 103 } 112 104 … … 116 108 fat_bs_t *bs; 117 109 fat_dentry_t *d; 110 uint16_t bps; 111 unsigned dps; 118 112 int rc; 119 113 … … 121 115 122 116 bs = block_bb_get(node->idx->dev_handle); 117 bps = uint16_t_le2host(bs->bps); 118 dps = bps / sizeof(fat_dentry_t); 123 119 124 120 /* Read the block that contains the dentry of interest. */ 125 121 rc = _fat_block_get(&b, bs, node->idx->dev_handle, node->idx->pfc, 126 NULL, (node->idx->pdi * sizeof(fat_dentry_t)) / BPS(bs), 127 BLOCK_FLAGS_NONE); 122 (node->idx->pdi * sizeof(fat_dentry_t)) / bps, BLOCK_FLAGS_NONE); 128 123 if (rc != EOK) 129 124 return rc; 130 125 131 d = ((fat_dentry_t *)b->data) + (node->idx->pdi % DPS(bs));126 d = ((fat_dentry_t *)b->data) + (node->idx->pdi % dps); 132 127 133 128 d->firstc = host2uint16_t_le(node->firstc); … … 271 266 fat_dentry_t *d; 272 267 fat_node_t *nodep = NULL; 268 unsigned bps; 269 unsigned spc; 270 unsigned dps; 273 271 int rc; 274 272 … … 300 298 301 299 bs = block_bb_get(idxp->dev_handle); 300 bps = uint16_t_le2host(bs->bps); 301 spc = bs->spc; 302 dps = bps / sizeof(fat_dentry_t); 302 303 303 304 /* Read the block that contains the dentry of interest. */ 304 rc = _fat_block_get(&b, bs, idxp->dev_handle, idxp->pfc, NULL,305 (idxp->pdi * sizeof(fat_dentry_t)) / BPS(bs), BLOCK_FLAGS_NONE);305 rc = _fat_block_get(&b, bs, idxp->dev_handle, idxp->pfc, 306 (idxp->pdi * sizeof(fat_dentry_t)) / bps, BLOCK_FLAGS_NONE); 306 307 if (rc != EOK) { 307 308 (void) fat_node_put(FS_NODE(nodep)); … … 309 310 } 310 311 311 d = ((fat_dentry_t *)b->data) + (idxp->pdi % DPS(bs));312 d = ((fat_dentry_t *)b->data) + (idxp->pdi % dps); 312 313 if (d->attr & FAT_ATTR_SUBDIR) { 313 314 /* … … 329 330 return rc; 330 331 } 331 nodep->size = BPS(bs) * SPC(bs)* clusters;332 nodep->size = bps * spc * clusters; 332 333 } else { 333 334 nodep->type = FAT_FILE; … … 367 368 char name[FAT_NAME_LEN + 1 + FAT_EXT_LEN + 1]; 368 369 unsigned i, j; 370 unsigned bps; /* bytes per sector */ 371 unsigned dps; /* dentries per sector */ 369 372 unsigned blocks; 370 373 fat_dentry_t *d; … … 374 377 fibril_mutex_lock(&parentp->idx->lock); 375 378 bs = block_bb_get(parentp->idx->dev_handle); 376 blocks = parentp->size / BPS(bs); 379 bps = uint16_t_le2host(bs->bps); 380 dps = bps / sizeof(fat_dentry_t); 381 blocks = parentp->size / bps; 377 382 for (i = 0; i < blocks; i++) { 378 383 rc = fat_block_get(&b, bs, parentp, i, BLOCK_FLAGS_NONE); … … 381 386 return rc; 382 387 } 383 for (j = 0; j < DPS(bs); j++) {388 for (j = 0; j < dps; j++) { 384 389 d = ((fat_dentry_t *)b->data) + j; 385 390 switch (fat_classify_dentry(d)) { … … 409 414 fat_idx_t *idx = fat_idx_get_by_pos( 410 415 parentp->idx->dev_handle, parentp->firstc, 411 i * DPS(bs)+ j);416 i * dps + j); 412 417 fibril_mutex_unlock(&parentp->idx->lock); 413 418 if (!idx) { … … 508 513 fat_bs_t *bs; 509 514 fat_cluster_t mcl, lcl; 515 uint16_t bps; 510 516 int rc; 511 517 512 518 bs = block_bb_get(dev_handle); 519 bps = uint16_t_le2host(bs->bps); 513 520 if (flags & L_DIRECTORY) { 514 521 /* allocate a cluster */ … … 539 546 nodep->type = FAT_DIRECTORY; 540 547 nodep->firstc = mcl; 541 nodep->size = BPS(bs) * SPC(bs);548 nodep->size = bps * bs->spc; 542 549 } else { 543 550 nodep->type = FAT_FILE; … … 602 609 block_t *b; 603 610 unsigned i, j; 611 uint16_t bps; 612 unsigned dps; 604 613 unsigned blocks; 605 614 fat_cluster_t mcl, lcl; … … 631 640 fibril_mutex_lock(&parentp->idx->lock); 632 641 bs = block_bb_get(parentp->idx->dev_handle); 633 634 blocks = parentp->size / BPS(bs); 642 bps = uint16_t_le2host(bs->bps); 643 dps = bps / sizeof(fat_dentry_t); 644 645 blocks = parentp->size / bps; 635 646 636 647 for (i = 0; i < blocks; i++) { … … 640 651 return rc; 641 652 } 642 for (j = 0; j < DPS(bs); j++) {653 for (j = 0; j < dps; j++) { 643 654 d = ((fat_dentry_t *)b->data) + j; 644 655 switch (fat_classify_dentry(d)) { … … 680 691 return rc; 681 692 } 682 rc = fat_append_clusters(bs, parentp, mcl , lcl);693 rc = fat_append_clusters(bs, parentp, mcl); 683 694 if (rc != EOK) { 684 695 (void) fat_free_clusters(bs, parentp->idx->dev_handle, mcl); … … 686 697 return rc; 687 698 } 688 parentp->size += BPS(bs) * SPC(bs);699 parentp->size += bps * bs->spc; 689 700 parentp->dirty = true; /* need to sync node */ 690 701 rc = fat_block_get(&b, bs, parentp, i, BLOCK_FLAGS_NONE); … … 760 771 761 772 childp->idx->pfc = parentp->firstc; 762 childp->idx->pdi = i * DPS(bs)+ j;773 childp->idx->pdi = i * dps + j; 763 774 fibril_mutex_unlock(&childp->idx->lock); 764 775 … … 782 793 fat_bs_t *bs; 783 794 fat_dentry_t *d; 795 uint16_t bps; 784 796 block_t *b; 785 797 bool has_children; … … 800 812 fibril_mutex_lock(&childp->idx->lock); 801 813 bs = block_bb_get(childp->idx->dev_handle); 814 bps = uint16_t_le2host(bs->bps); 802 815 803 816 rc = _fat_block_get(&b, bs, childp->idx->dev_handle, childp->idx->pfc, 804 NULL, (childp->idx->pdi * sizeof(fat_dentry_t)) / BPS(bs),817 (childp->idx->pdi * sizeof(fat_dentry_t)) / bps, 805 818 BLOCK_FLAGS_NONE); 806 819 if (rc != EOK) 807 820 goto error; 808 821 d = (fat_dentry_t *)b->data + 809 (childp->idx->pdi % ( BPS(bs)/ sizeof(fat_dentry_t)));822 (childp->idx->pdi % (bps / sizeof(fat_dentry_t))); 810 823 /* mark the dentry as not-currently-used */ 811 824 d->name[0] = FAT_DENTRY_ERASED; … … 839 852 fat_bs_t *bs; 840 853 fat_node_t *nodep = FAT_NODE(fn); 854 unsigned bps; 855 unsigned dps; 841 856 unsigned blocks; 842 857 block_t *b; … … 851 866 fibril_mutex_lock(&nodep->idx->lock); 852 867 bs = block_bb_get(nodep->idx->dev_handle); 853 854 blocks = nodep->size / BPS(bs); 868 bps = uint16_t_le2host(bs->bps); 869 dps = bps / sizeof(fat_dentry_t); 870 871 blocks = nodep->size / bps; 855 872 856 873 for (i = 0; i < blocks; i++) { … … 862 879 return rc; 863 880 } 864 for (j = 0; j < DPS(bs); j++) {881 for (j = 0; j < dps; j++) { 865 882 d = ((fat_dentry_t *)b->data) + j; 866 883 switch (fat_classify_dentry(d)) { … … 959 976 enum cache_mode cmode; 960 977 fat_bs_t *bs; 978 uint16_t bps; 979 uint16_t rde; 961 980 962 981 /* Accept the mount options */ … … 995 1014 bs = block_bb_get(dev_handle); 996 1015 997 if (BPS(bs) != BS_SIZE) { 1016 /* Read the number of root directory entries. */ 1017 bps = uint16_t_le2host(bs->bps); 1018 rde = uint16_t_le2host(bs->root_ent_max); 1019 1020 if (bps != BS_SIZE) { 998 1021 block_fini(dev_handle); 999 1022 ipc_answer_0(rid, ENOTSUP); … … 1002 1025 1003 1026 /* Initialize the block cache */ 1004 rc = block_cache_init(dev_handle, BPS(bs), 0 /* XXX */, cmode);1027 rc = block_cache_init(dev_handle, bps, 0 /* XXX */, cmode); 1005 1028 if (rc != EOK) { 1006 1029 block_fini(dev_handle); … … 1064 1087 rootp->refcnt = 1; 1065 1088 rootp->lnkcnt = 0; /* FS root is not linked */ 1066 rootp->size = RDE(bs)* sizeof(fat_dentry_t);1089 rootp->size = rde * sizeof(fat_dentry_t); 1067 1090 rootp->idx = ridxp; 1068 1091 ridxp->nodep = rootp; … … 1142 1165 fat_node_t *nodep; 1143 1166 fat_bs_t *bs; 1167 uint16_t bps; 1144 1168 size_t bytes; 1145 1169 block_t *b; … … 1167 1191 1168 1192 bs = block_bb_get(dev_handle); 1193 bps = uint16_t_le2host(bs->bps); 1169 1194 1170 1195 if (nodep->type == FAT_FILE) { … … 1179 1204 (void) async_data_read_finalize(callid, NULL, 0); 1180 1205 } else { 1181 bytes = min(len, BPS(bs) - pos % BPS(bs));1206 bytes = min(len, bps - pos % bps); 1182 1207 bytes = min(bytes, nodep->size - pos); 1183 rc = fat_block_get(&b, bs, nodep, pos / BPS(bs),1208 rc = fat_block_get(&b, bs, nodep, pos / bps, 1184 1209 BLOCK_FLAGS_NONE); 1185 1210 if (rc != EOK) { … … 1189 1214 return; 1190 1215 } 1191 (void) async_data_read_finalize(callid, 1192 b ->data + pos % BPS(bs), bytes);1216 (void) async_data_read_finalize(callid, b->data + pos % bps, 1217 bytes); 1193 1218 rc = block_put(b); 1194 1219 if (rc != EOK) { … … 1205 1230 1206 1231 assert(nodep->type == FAT_DIRECTORY); 1207 assert(nodep->size % BPS(bs)== 0);1208 assert( BPS(bs)% sizeof(fat_dentry_t) == 0);1232 assert(nodep->size % bps == 0); 1233 assert(bps % sizeof(fat_dentry_t) == 0); 1209 1234 1210 1235 /* … … 1214 1239 * the position pointer accordingly. 1215 1240 */ 1216 bnum = (pos * sizeof(fat_dentry_t)) / BPS(bs);1217 while (bnum < nodep->size / BPS(bs)) {1241 bnum = (pos * sizeof(fat_dentry_t)) / bps; 1242 while (bnum < nodep->size / bps) { 1218 1243 aoff64_t o; 1219 1244 … … 1222 1247 if (rc != EOK) 1223 1248 goto err; 1224 for (o = pos % ( BPS(bs)/ sizeof(fat_dentry_t));1225 o < BPS(bs)/ sizeof(fat_dentry_t);1249 for (o = pos % (bps / sizeof(fat_dentry_t)); 1250 o < bps / sizeof(fat_dentry_t); 1226 1251 o++, pos++) { 1227 1252 d = ((fat_dentry_t *)b->data) + o; … … 1281 1306 size_t bytes, size; 1282 1307 block_t *b; 1308 uint16_t bps; 1309 unsigned spc; 1310 unsigned bpc; /* bytes per cluster */ 1283 1311 aoff64_t boundary; 1284 1312 int flags = BLOCK_FLAGS_NONE; … … 1306 1334 1307 1335 bs = block_bb_get(dev_handle); 1336 bps = uint16_t_le2host(bs->bps); 1337 spc = bs->spc; 1338 bpc = bps * spc; 1308 1339 1309 1340 /* … … 1314 1345 * value signalizing a smaller number of bytes written. 1315 1346 */ 1316 bytes = min(len, BPS(bs) - pos % BPS(bs));1317 if (bytes == BPS(bs))1347 bytes = min(len, bps - pos % bps); 1348 if (bytes == bps) 1318 1349 flags |= BLOCK_FLAGS_NOREAD; 1319 1350 1320 boundary = ROUND_UP(nodep->size, BPC(bs));1351 boundary = ROUND_UP(nodep->size, bpc); 1321 1352 if (pos < boundary) { 1322 1353 /* … … 1333 1364 return; 1334 1365 } 1335 rc = fat_block_get(&b, bs, nodep, pos / BPS(bs), flags);1366 rc = fat_block_get(&b, bs, nodep, pos / bps, flags); 1336 1367 if (rc != EOK) { 1337 1368 (void) fat_node_put(fn); … … 1340 1371 return; 1341 1372 } 1342 (void) async_data_write_finalize(callid, 1343 b ->data + pos % BPS(bs), bytes);1373 (void) async_data_write_finalize(callid, b->data + pos % bps, 1374 bytes); 1344 1375 b->dirty = true; /* need to sync block */ 1345 1376 rc = block_put(b); … … 1365 1396 fat_cluster_t mcl, lcl; 1366 1397 1367 nclsts = (ROUND_UP(pos + bytes, BPC(bs)) - boundary) / BPC(bs);1398 nclsts = (ROUND_UP(pos + bytes, bpc) - boundary) / bpc; 1368 1399 /* create an independent chain of nclsts clusters in all FATs */ 1369 1400 rc = fat_alloc_clusters(bs, dev_handle, nclsts, &mcl, &lcl); … … 1384 1415 return; 1385 1416 } 1386 rc = _fat_block_get(&b, bs, dev_handle, lcl, NULL,1387 (pos / BPS(bs)) % SPC(bs),flags);1417 rc = _fat_block_get(&b, bs, dev_handle, lcl, (pos / bps) % spc, 1418 flags); 1388 1419 if (rc != EOK) { 1389 1420 (void) fat_free_clusters(bs, dev_handle, mcl); … … 1393 1424 return; 1394 1425 } 1395 (void) async_data_write_finalize(callid, 1396 b ->data + pos % BPS(bs), bytes);1426 (void) async_data_write_finalize(callid, b->data + pos % bps, 1427 bytes); 1397 1428 b->dirty = true; /* need to sync block */ 1398 1429 rc = block_put(b); … … 1407 1438 * node's cluster chain. 1408 1439 */ 1409 rc = fat_append_clusters(bs, nodep, mcl , lcl);1440 rc = fat_append_clusters(bs, nodep, mcl); 1410 1441 if (rc != EOK) { 1411 1442 (void) fat_free_clusters(bs, dev_handle, mcl); … … 1431 1462 fat_node_t *nodep; 1432 1463 fat_bs_t *bs; 1464 uint16_t bps; 1465 uint8_t spc; 1466 unsigned bpc; /* bytes per cluster */ 1433 1467 int rc; 1434 1468 … … 1445 1479 1446 1480 bs = block_bb_get(dev_handle); 1481 bps = uint16_t_le2host(bs->bps); 1482 spc = bs->spc; 1483 bpc = bps * spc; 1447 1484 1448 1485 if (nodep->size == size) { … … 1454 1491 */ 1455 1492 rc = EINVAL; 1456 } else if (ROUND_UP(nodep->size, BPC(bs)) == ROUND_UP(size, BPC(bs))) {1493 } else if (ROUND_UP(nodep->size, bpc) == ROUND_UP(size, bpc)) { 1457 1494 /* 1458 1495 * The node will be shrunk, but no clusters will be deallocated. … … 1472 1509 fat_cluster_t lastc; 1473 1510 rc = fat_cluster_walk(bs, dev_handle, nodep->firstc, 1474 &lastc, NULL, (size - 1) / BPC(bs));1511 &lastc, NULL, (size - 1) / bpc); 1475 1512 if (rc != EOK) 1476 1513 goto out; … … 1527 1564 void fat_sync(ipc_callid_t rid, ipc_call_t *request) 1528 1565 { 1529 /* Dummy implementation */ 1530 ipc_answer_0(rid, EOK); 1566 dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request); 1567 fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request); 1568 1569 fs_node_t *fn; 1570 int rc = fat_node_get(&fn, dev_handle, index); 1571 if (rc != EOK) { 1572 ipc_answer_0(rid, rc); 1573 return; 1574 } 1575 if (!fn) { 1576 ipc_answer_0(rid, ENOENT); 1577 return; 1578 } 1579 1580 fat_node_t *nodep = FAT_NODE(fn); 1581 1582 nodep->dirty = true; 1583 rc = fat_node_sync(nodep); 1584 1585 fat_node_put(fn); 1586 ipc_answer_0(rid, rc); 1531 1587 } 1532 1588
Note:
See TracChangeset
for help on using the changeset viewer.