X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fexfat-utils.git;a=blobdiff_plain;f=libexfat%2Fcluster.c;h=1257c7ae45c3789ce500aeaebe115a9640ede72c;hp=7251c31b3b0da5501fbfe12b273cab366d0a5c03;hb=1f5c4d900674e89576886f971ba292ad14f947f7;hpb=5f0f9f40c1e9014e86eeb82d8c4bc718dae999cc

diff --git a/libexfat/cluster.c b/libexfat/cluster.c
index 7251c31..1257c7a 100644
--- a/libexfat/cluster.c
+++ b/libexfat/cluster.c
@@ -80,7 +80,7 @@ cluster_t exfat_next_cluster(const struct exfat* ef,
 		return cluster + 1;
 	fat_offset = s2o(ef, le32_to_cpu(ef->sb->fat_sector_start))
 		+ cluster * sizeof(cluster_t);
-	exfat_read_raw(&next, sizeof(next), fat_offset, ef->fd);
+	exfat_pread(ef->dev, &next, sizeof(next), fat_offset);
 	return le32_to_cpu(next);
 }
 
@@ -145,8 +145,8 @@ static cluster_t find_bit_and_set(uint8_t* bitmap, cluster_t start,
 
 void exfat_flush_cmap(struct exfat* ef)
 {
-	exfat_write_raw(ef->cmap.chunk, (ef->cmap.chunk_size + 7) / 8,
-			exfat_c2o(ef, ef->cmap.start_cluster), ef->fd);
+	exfat_pwrite(ef->dev, ef->cmap.chunk, (ef->cmap.chunk_size + 7) / 8,
+			exfat_c2o(ef, ef->cmap.start_cluster));
 	ef->cmap.dirty = 0;
 }
 
@@ -161,7 +161,7 @@ static void set_next_cluster(const struct exfat* ef, int contiguous,
 	fat_offset = s2o(ef, le32_to_cpu(ef->sb->fat_sector_start))
 		+ current * sizeof(cluster_t);
 	next_le32 = cpu_to_le32(next);
-	exfat_write_raw(&next_le32, sizeof(next_le32), fat_offset, ef->fd);
+	exfat_pwrite(ef->dev, &next_le32, sizeof(next_le32), fat_offset);
 }
 
 static cluster_t allocate_cluster(struct exfat* ef, cluster_t hint)
@@ -182,7 +182,6 @@ static cluster_t allocate_cluster(struct exfat* ef, cluster_t hint)
 	}
 
 	ef->cmap.dirty = 1;
-	/* FIXME update percentage of used space */
 	return cluster;
 }
 
@@ -196,7 +195,6 @@ static void free_cluster(struct exfat* ef, cluster_t cluster)
 
 	BMAP_CLR(ef->cmap.chunk, cluster - EXFAT_FIRST_DATA_CLUSTER);
 	ef->cmap.dirty = 1;
-	/* FIXME update percentage of used space */
 }
 
 static void make_noncontiguous(const struct exfat* ef, cluster_t first,
@@ -325,7 +323,7 @@ static int shrink_file(struct exfat* ef, struct exfat_node* node,
 
 static void erase_raw(struct exfat* ef, size_t size, off_t offset)
 {
-	exfat_write_raw(ef->zero_cluster, size, offset, ef->fd);
+	exfat_pwrite(ef->dev, ef->zero_cluster, size, offset);
 }
 
 static int erase_range(struct exfat* ef, struct exfat_node* node,