Index: uspace/srv/fs/exfat/exfat_bitmap.c =================================================================== --- uspace/srv/fs/exfat/exfat_bitmap.c (revision c01bb5f96a155bdec60146b151e214e7cd17f2c4) +++ uspace/srv/fs/exfat/exfat_bitmap.c (revision 5dbd69669d92be4b3b8f009238f2eeb3c0ba1985) @@ -48,5 +48,5 @@ -int bitmap_is_free(exfat_bs_t *bs, service_id_t service_id, +int exfat_bitmap_is_free(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t clst) { @@ -89,5 +89,5 @@ } -int bitmap_set_cluster(exfat_bs_t *bs, service_id_t service_id, +int exfat_bitmap_set_cluster(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t clst) { @@ -124,5 +124,5 @@ } -int bitmap_clear_cluster(exfat_bs_t *bs, service_id_t service_id, +int exfat_bitmap_clear_cluster(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t clst) { @@ -160,5 +160,5 @@ } -int bitmap_set_clusters(exfat_bs_t *bs, service_id_t service_id, +int exfat_bitmap_set_clusters(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t firstc, exfat_cluster_t count) { @@ -168,8 +168,8 @@ while (clst < firstc + count ) { - rc = bitmap_set_cluster(bs, service_id, clst); + rc = exfat_bitmap_set_cluster(bs, service_id, clst); if (rc != EOK) { if (clst - firstc > 0) - (void) bitmap_clear_clusters(bs, service_id, + (void) exfat_bitmap_clear_clusters(bs, service_id, firstc, clst - firstc); return rc; @@ -180,5 +180,5 @@ } -int bitmap_clear_clusters(exfat_bs_t *bs, service_id_t service_id, +int exfat_bitmap_clear_clusters(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t firstc, exfat_cluster_t count) { @@ -188,5 +188,5 @@ while (clst < firstc + count) { - rc = bitmap_clear_cluster(bs, service_id, clst); + rc = exfat_bitmap_clear_cluster(bs, service_id, clst); if (rc != EOK) return rc; @@ -196,5 +196,5 @@ } -int bitmap_alloc_clusters(exfat_bs_t *bs, service_id_t service_id, +int exfat_bitmap_alloc_clusters(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t *firstc, exfat_cluster_t count) { @@ -204,8 +204,8 @@ while (startc < DATA_CNT(bs) + 2) { endc = startc; - while (bitmap_is_free(bs, service_id, endc) == EOK) { + while (exfat_bitmap_is_free(bs, service_id, endc) == EOK) { if ((endc - startc) + 1 == count) { *firstc = startc; - return bitmap_set_clusters(bs, service_id, startc, count); + return exfat_bitmap_set_clusters(bs, service_id, startc, count); } else endc++; @@ -217,9 +217,9 @@ -int bitmap_append_clusters(exfat_bs_t *bs, exfat_node_t *nodep, +int exfat_bitmap_append_clusters(exfat_bs_t *bs, exfat_node_t *nodep, exfat_cluster_t count) { if (nodep->firstc == 0) { - return bitmap_alloc_clusters(bs, nodep->idx->service_id, + return exfat_bitmap_alloc_clusters(bs, nodep->idx->service_id, &nodep->firstc, count); } else { @@ -228,7 +228,7 @@ clst = lastc + 1; - while (bitmap_is_free(bs, nodep->idx->service_id, clst) == EOK) { + while (exfat_bitmap_is_free(bs, nodep->idx->service_id, clst) == EOK) { if (clst - lastc == count){ - return bitmap_set_clusters(bs, nodep->idx->service_id, + return exfat_bitmap_set_clusters(bs, nodep->idx->service_id, lastc + 1, count); } else @@ -240,5 +240,5 @@ -int bitmap_free_clusters(exfat_bs_t *bs, exfat_node_t *nodep, +int exfat_bitmap_free_clusters(exfat_bs_t *bs, exfat_node_t *nodep, exfat_cluster_t count) { @@ -247,9 +247,9 @@ lastc -= count; - return bitmap_clear_clusters(bs, nodep->idx->service_id, lastc + 1, count); -} - - -int bitmap_replicate_clusters(exfat_bs_t *bs, exfat_node_t *nodep) + return exfat_bitmap_clear_clusters(bs, nodep->idx->service_id, lastc + 1, count); +} + + +int exfat_bitmap_replicate_clusters(exfat_bs_t *bs, exfat_node_t *nodep) { int rc; Index: uspace/srv/fs/exfat/exfat_bitmap.h =================================================================== --- uspace/srv/fs/exfat/exfat_bitmap.h (revision c01bb5f96a155bdec60146b151e214e7cd17f2c4) +++ uspace/srv/fs/exfat/exfat_bitmap.h (revision 5dbd69669d92be4b3b8f009238f2eeb3c0ba1985) @@ -42,20 +42,20 @@ struct exfat_bs; -extern int bitmap_alloc_clusters(struct exfat_bs *, service_id_t, +extern int exfat_bitmap_alloc_clusters(struct exfat_bs *, service_id_t, exfat_cluster_t *, exfat_cluster_t); -extern int bitmap_append_clusters(struct exfat_bs *, struct exfat_node *, +extern int exfat_bitmap_append_clusters(struct exfat_bs *, struct exfat_node *, exfat_cluster_t); -extern int bitmap_free_clusters(struct exfat_bs *, struct exfat_node *, +extern int exfat_bitmap_free_clusters(struct exfat_bs *, struct exfat_node *, exfat_cluster_t); -extern int bitmap_replicate_clusters(struct exfat_bs *, struct exfat_node *); +extern int exfat_bitmap_replicate_clusters(struct exfat_bs *, struct exfat_node *); -extern int bitmap_is_free(struct exfat_bs *, service_id_t, exfat_cluster_t); -extern int bitmap_set_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t); -extern int bitmap_clear_cluster(struct exfat_bs *, service_id_t, +extern int exfat_bitmap_is_free(struct exfat_bs *, service_id_t, exfat_cluster_t); +extern int exfat_bitmap_set_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t); +extern int exfat_bitmap_clear_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t); -extern int bitmap_set_clusters(struct exfat_bs *, service_id_t, +extern int exfat_bitmap_set_clusters(struct exfat_bs *, service_id_t, exfat_cluster_t, exfat_cluster_t); -extern int bitmap_clear_clusters(struct exfat_bs *, service_id_t, +extern int exfat_bitmap_clear_clusters(struct exfat_bs *, service_id_t, exfat_cluster_t, exfat_cluster_t); Index: uspace/srv/fs/exfat/exfat_dentry.c =================================================================== --- uspace/srv/fs/exfat/exfat_dentry.c (revision c01bb5f96a155bdec60146b151e214e7cd17f2c4) +++ uspace/srv/fs/exfat/exfat_dentry.c (revision 5dbd69669d92be4b3b8f009238f2eeb3c0ba1985) @@ -130,5 +130,5 @@ } -size_t utf16_length(const uint16_t *wstr) +size_t exfat_utf16_length(const uint16_t *wstr) { size_t len = 0; Index: uspace/srv/fs/exfat/exfat_dentry.h =================================================================== --- uspace/srv/fs/exfat/exfat_dentry.h (revision c01bb5f96a155bdec60146b151e214e7cd17f2c4) +++ uspace/srv/fs/exfat/exfat_dentry.h (revision 5dbd69669d92be4b3b8f009238f2eeb3c0ba1985) @@ -160,5 +160,5 @@ extern bool exfat_valid_name(const char *); -extern size_t utf16_length(const uint16_t *); +extern size_t exfat_utf16_length(const uint16_t *); Index: uspace/srv/fs/exfat/exfat_directory.c =================================================================== --- uspace/srv/fs/exfat/exfat_directory.c (revision c01bb5f96a155bdec60146b151e214e7cd17f2c4) +++ uspace/srv/fs/exfat/exfat_directory.c (revision 5dbd69669d92be4b3b8f009238f2eeb3c0ba1985) @@ -371,5 +371,5 @@ ds.stream.valid_data_size = 0; ds.stream.data_size = 0; - ds.stream.name_size = utf16_length(wname); + ds.stream.name_size = exfat_utf16_length(wname); ds.stream.hash = host2uint16_t_le(exfat_name_hash(wname, uctable, uctable_chars)); Index: uspace/srv/fs/exfat/exfat_fat.c =================================================================== --- uspace/srv/fs/exfat/exfat_fat.c (revision c01bb5f96a155bdec60146b151e214e7cd17f2c4) +++ uspace/srv/fs/exfat/exfat_fat.c (revision 5dbd69669d92be4b3b8f009238f2eeb3c0ba1985) @@ -314,5 +314,5 @@ clst++) { /* Need to rewrite because of multiple exfat_bitmap_get calls */ - if (bitmap_is_free(bs, service_id, clst) == EOK) { + if (exfat_bitmap_is_free(bs, service_id, clst) == EOK) { /* * The cluster is free. Put it into our stack @@ -325,5 +325,5 @@ goto exit_error; found++; - rc = bitmap_set_cluster(bs, service_id, clst); + rc = exfat_bitmap_set_cluster(bs, service_id, clst); if (rc != EOK) goto exit_error; @@ -346,5 +346,5 @@ /* If something wrong - free the clusters */ while (found--) { - (void) bitmap_clear_cluster(bs, service_id, lifo[found]); + (void) exfat_bitmap_clear_cluster(bs, service_id, lifo[found]); (void) exfat_set_cluster(bs, service_id, lifo[found], 0); } @@ -378,5 +378,5 @@ if (rc != EOK) return rc; - rc = bitmap_clear_cluster(bs, service_id, firstc); + rc = exfat_bitmap_clear_cluster(bs, service_id, firstc); if (rc != EOK) return rc; Index: uspace/srv/fs/exfat/exfat_ops.c =================================================================== --- uspace/srv/fs/exfat/exfat_ops.c (revision c01bb5f96a155bdec60146b151e214e7cd17f2c4) +++ uspace/srv/fs/exfat/exfat_ops.c (revision 5dbd69669d92be4b3b8f009238f2eeb3c0ba1985) @@ -405,5 +405,5 @@ if (!nodep->fragmented) { - rc = bitmap_append_clusters(bs, nodep, clusters); + rc = exfat_bitmap_append_clusters(bs, nodep, clusters); if (rc != ENOSPC) return rc; @@ -411,5 +411,5 @@ nodep->fragmented = true; nodep->dirty = true; /* need to sync node */ - rc = bitmap_replicate_clusters(bs, nodep); + rc = exfat_bitmap_replicate_clusters(bs, nodep); if (rc != EOK) return rc; @@ -457,5 +457,5 @@ clsts = prev_clsts - new_clsts; - rc = bitmap_free_clusters(bs, nodep, clsts); + rc = exfat_bitmap_free_clusters(bs, nodep, clsts); if (rc != EOK) return rc; @@ -704,5 +704,5 @@ nodep->firstc); else - rc = bitmap_free_clusters(bs, nodep, + rc = exfat_bitmap_free_clusters(bs, nodep, ROUND_UP(nodep->size, BPC(bs)) / BPC(bs)); } @@ -758,9 +758,5 @@ fibril_mutex_unlock(&parentp->idx->lock); - if (rc != EOK) - return rc; - fibril_mutex_lock(&childp->idx->lock); - childp->idx->pfc = parentp->firstc; @@ -1463,5 +1459,8 @@ } - (void) exfat_node_put(fn); + int rc2 = exfat_node_put(fn); + if (rc == EOK && rc2 != EOK) + rc = rc2; + return rc; }