X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=libexfat%2Fnode.c;h=44f4ae320009015b83c2677a2abf03f0b599ea09;hb=cf962cdfdd7fe80ae8dac93d689c90cc55350a2a;hp=d05f20dc15aecb729c52557186a778eb8530e368;hpb=c4d1bc1e671c875d7fa6a1db105fe8fb6a0aeafe;p=android-x86%2Fexternal-exfat.git

diff --git a/libexfat/node.c b/libexfat/node.c
index d05f20d..44f4ae3 100644
--- a/libexfat/node.c
+++ b/libexfat/node.c
@@ -3,7 +3,7 @@
 	exFAT file system implementation library.
 
 	Free exFAT implementation.
-	Copyright (C) 2010-2015  Andrew Nayenko
+	Copyright (C) 2010-2016  Andrew Nayenko
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@ struct iterator
 {
 	cluster_t cluster;
 	off_t offset;
-	int contiguous;
 	char* chunk;
 };
 
@@ -44,19 +43,19 @@ struct exfat_node* exfat_get_node(struct exfat_node* node)
 
 void exfat_put_node(struct exfat* ef, struct exfat_node* node)
 {
-	char buffer[UTF8_BYTES(EXFAT_NAME_MAX) + 1];
+	char buffer[EXFAT_UTF8_NAME_BUFFER_MAX];
 
 	--node->references;
 	if (node->references < 0)
 	{
-		exfat_get_name(node, buffer, sizeof(buffer) - 1);
+		exfat_get_name(node, buffer);
 		exfat_bug("reference counter of '%s' is below zero", buffer);
 	}
 	else if (node->references == 0 && node != ef->root)
 	{
-		if (node->flags & EXFAT_ATTRIB_DIRTY)
+		if (node->is_dirty)
 		{
-			exfat_get_name(node, buffer, sizeof(buffer) - 1);
+			exfat_get_name(node, buffer);
 			exfat_warn("dirty node '%s' with zero references", buffer);
 		}
 	}
@@ -74,7 +73,7 @@ int exfat_cleanup_node(struct exfat* ef, struct exfat_node* node)
 		exfat_bug("unable to cleanup a node with %d references",
 				node->references);
 
-	if (node->flags & EXFAT_ATTRIB_UNLINKED)
+	if (node->is_unlinked)
 	{
 		/* free all clusters and node structure itself */
 		rc = exfat_truncate(ef, node, 0, true);
@@ -95,21 +94,35 @@ static off_t co2o(struct exfat* ef, cluster_t cluster, off_t offset)
 static int opendir(struct exfat* ef, const struct exfat_node* dir,
 		struct iterator* it)
 {
-	if (!(dir->flags & EXFAT_ATTRIB_DIR))
-		exfat_bug("not a directory");
+	char buffer[EXFAT_UTF8_NAME_BUFFER_MAX];
+
+	if (!(dir->attrib & EXFAT_ATTRIB_DIR))
+	{
+		exfat_get_name(dir, buffer);
+		exfat_bug("'%s' is not a directory", buffer);
+	}
+	if (CLUSTER_INVALID(dir->start_cluster))
+	{
+		exfat_get_name(dir, buffer);
+		exfat_error("'%s' directory starts with invalid cluster %#x", buffer,
+				dir->start_cluster);
+		return -EIO;
+	}
 	it->cluster = dir->start_cluster;
 	it->offset = 0;
-	it->contiguous = IS_CONTIGUOUS(*dir);
 	it->chunk = malloc(CLUSTER_SIZE(*ef->sb));
 	if (it->chunk == NULL)
 	{
-		exfat_error("out of memory");
+		exfat_error("failed to allocate memory for directory cluster");
 		return -ENOMEM;
 	}
 	if (exfat_pread(ef->dev, it->chunk, CLUSTER_SIZE(*ef->sb),
 			exfat_c2o(ef, it->cluster)) < 0)
 	{
-		exfat_error("failed to read directory cluster %#x", it->cluster);
+		free(it->chunk);
+		exfat_get_name(dir, buffer);
+		exfat_error("failed to read '%s' directory cluster %#x", buffer,
+				it->cluster);
 		return -EIO;
 	}
 	return 0;
@@ -119,7 +132,6 @@ static void closedir(struct iterator* it)
 {
 	it->cluster = 0;
 	it->offset = 0;
-	it->contiguous = 0;
 	free(it->chunk);
 	it->chunk = NULL;
 }
@@ -154,6 +166,46 @@ static bool fetch_next_entry(struct exfat* ef, const struct exfat_node* parent,
 	return true;
 }
 
+static int read_entries(struct exfat* ef, struct exfat_node* dir,
+		struct exfat_entry* entries, int n, off_t offset)
+{
+	ssize_t size;
+
+	if (!(dir->attrib & EXFAT_ATTRIB_DIR))
+		exfat_bug("attempted to read entries from a file");
+
+	size = exfat_generic_pread(ef, dir, entries,
+			sizeof(struct exfat_entry[n]), offset);
+	if (size == sizeof(struct exfat_entry[n]))
+		return 0; /* success */
+	if (size == 0)
+		return -ENOENT;
+	if (size < 0)
+		return -EIO;
+	exfat_error("read %zd bytes instead of %zu bytes", size,
+			sizeof(struct exfat_entry[n]));
+	return -EIO;
+}
+
+static int write_entries(struct exfat* ef, struct exfat_node* dir,
+		const struct exfat_entry* entries, int n, off_t offset)
+{
+	ssize_t size;
+
+	if (!(dir->attrib & EXFAT_ATTRIB_DIR))
+		exfat_bug("attempted to write entries into a file");
+
+	size = exfat_generic_pwrite(ef, dir, entries,
+			sizeof(struct exfat_entry[n]), offset);
+	if (size == sizeof(struct exfat_entry[n]))
+		return 0; /* success */
+	if (size < 0)
+		return -EIO;
+	exfat_error("wrote %zd bytes instead of %zu bytes", size,
+			sizeof(struct exfat_entry[n]));
+	return -EIO;
+}
+
 static struct exfat_node* allocate_node(void)
 {
 	struct exfat_node* node = malloc(sizeof(struct exfat_node));
@@ -169,7 +221,8 @@ static struct exfat_node* allocate_node(void)
 static void init_node_meta1(struct exfat_node* node,
 		const struct exfat_entry_meta1* meta1)
 {
-	node->flags = le16_to_cpu(meta1->attrib);
+	node->attrib = le16_to_cpu(meta1->attrib);
+	node->continuations = meta1->continuations;
 	node->mtime = exfat_exfat2unix(meta1->mdate, meta1->mtime,
 			meta1->mtime_cs);
 	/* there is no centiseconds field for atime */
@@ -182,8 +235,7 @@ static void init_node_meta2(struct exfat_node* node,
 	node->size = le64_to_cpu(meta2->size);
 	node->start_cluster = le32_to_cpu(meta2->start_cluster);
 	node->fptr_cluster = node->start_cluster;
-	if (meta2->flags & EXFAT_FLAG_CONTIGUOUS)
-		node->flags |= EXFAT_ATTRIB_CONTIGUOUS;
+	node->is_contiguous = ((meta2->flags & EXFAT_FLAG_CONTIGUOUS) != 0);
 }
 
 static const struct exfat_entry* get_entry_ptr(const struct exfat* ef,
@@ -194,9 +246,10 @@ static const struct exfat_entry* get_entry_ptr(const struct exfat* ef,
 }
 
 static bool check_node(const struct exfat_node* node, uint16_t actual_checksum,
-		uint16_t reference_checksum, uint64_t valid_size)
+		uint16_t reference_checksum, uint64_t valid_size, int cluster_size)
 {
-	char buffer[UTF8_BYTES(EXFAT_NAME_MAX) + 1];
+	char buffer[EXFAT_UTF8_NAME_BUFFER_MAX];
+	bool ret = true;
 
 	/*
 	   Validate checksum first. If it's invalid all other fields probably
@@ -204,10 +257,10 @@ static bool check_node(const struct exfat_node* node, uint16_t actual_checksum,
 	*/
 	if (actual_checksum != reference_checksum)
 	{
-		exfat_get_name(node, buffer, sizeof(buffer) - 1);
+		exfat_get_name(node, buffer);
 		exfat_error("'%s' has invalid checksum (%#hx != %#hx)", buffer,
 				actual_checksum, reference_checksum);
-		return false;
+		ret = false;
 	}
 
 	/*
@@ -218,13 +271,72 @@ static bool check_node(const struct exfat_node* node, uint16_t actual_checksum,
 	*/
 	if (valid_size > node->size)
 	{
-		exfat_get_name(node, buffer, sizeof(buffer) - 1);
+		exfat_get_name(node, buffer);
 		exfat_error("'%s' has valid size (%"PRIu64") greater than size "
 				"(%"PRIu64")", buffer, valid_size, node->size);
-		return false;
+		ret = false;
 	}
 
-	return true;
+	/*
+	   Empty file must have zero start cluster. Non-empty file must start
+	   with a valid cluster. Directories cannot be empty (i.e. must always
+	   have a valid start cluster), but we will check this later in opendir()
+	   to give user a chance to read current directory.
+	*/
+	if (node->size == 0 && node->start_cluster != EXFAT_CLUSTER_FREE)
+	{
+		exfat_get_name(node, buffer);
+		exfat_error("'%s' is empty but start cluster is %#x", buffer,
+				node->start_cluster);
+		ret = false;
+	}
+	if (node->size > 0 && CLUSTER_INVALID(node->start_cluster))
+	{
+		exfat_get_name(node, buffer);
+		exfat_error("'%s' points to invalid cluster %#x", buffer,
+				node->start_cluster);
+		ret = false;
+	}
+
+	/* Empty file or directory must be marked as non-contiguous. */
+	if (node->size == 0 && node->is_contiguous)
+	{
+		exfat_get_name(node, buffer);
+		exfat_error("'%s' is empty but marked as contiguous (%#hx)", buffer,
+				node->attrib);
+		ret = false;
+	}
+
+	/* Directory size must be aligned on at cluster boundary. */
+	if ((node->attrib & EXFAT_ATTRIB_DIR) && node->size % cluster_size != 0)
+	{
+		exfat_get_name(node, buffer);
+		exfat_error("'%s' directory size %"PRIu64" is not divisible by %d", buffer,
+				node->size, cluster_size);
+		ret = false;
+	}
+
+	return ret;
+}
+
+static void decompress_upcase(uint16_t* output, const le16_t* source,
+		size_t size)
+{
+	size_t si;
+	size_t oi;
+
+	for (oi = 0; oi < EXFAT_UPCASE_CHARS; oi++)
+		output[oi] = oi;
+
+	for (si = 0, oi = 0; si < size && oi < EXFAT_UPCASE_CHARS; si++)
+	{
+		uint16_t ch = le16_to_cpu(source[si]);
+
+		if (ch == 0xffff && si + 1 < size)	/* indicates a run */
+			oi += le16_to_cpu(source[++si]);
+		else
+			output[oi++] = ch;
+	}
 }
 
 /*
@@ -247,6 +359,8 @@ static int readdir(struct exfat* ef, const struct exfat_node* parent,
 	uint16_t reference_checksum = 0;
 	uint16_t actual_checksum = 0;
 	uint64_t valid_size = 0;
+	uint64_t upcase_size = 0;
+	le16_t* upcase_comp = NULL;
 
 	*node = NULL;
 
@@ -318,21 +432,6 @@ static int readdir(struct exfat* ef, const struct exfat_node* parent,
 			init_node_meta2(*node, meta2);
 			actual_checksum = exfat_add_checksum(entry, actual_checksum);
 			valid_size = le64_to_cpu(meta2->valid_size);
-			/* empty files must be marked as non-contiguous */
-			if ((*node)->size == 0 && (meta2->flags & EXFAT_FLAG_CONTIGUOUS))
-			{
-				exfat_error("empty file marked as contiguous (0x%hhx)",
-						meta2->flags);
-				goto error;
-			}
-			/* directories must be aligned on at cluster boundary */
-			if (((*node)->flags & EXFAT_ATTRIB_DIR) &&
-				(*node)->size % CLUSTER_SIZE(*ef->sb) != 0)
-			{
-				exfat_error("directory has invalid size %"PRIu64" bytes",
-						(*node)->size);
-				goto error;
-			}
 			--continuations;
 			break;
 
@@ -353,7 +452,7 @@ static int readdir(struct exfat* ef, const struct exfat_node* parent,
 			if (--continuations == 0)
 			{
 				if (!check_node(*node, actual_checksum, reference_checksum,
-						valid_size))
+						valid_size, CLUSTER_SIZE(*ef->sb)))
 					goto error;
 				if (!fetch_next_entry(ef, parent, it))
 					goto error;
@@ -371,33 +470,48 @@ static int readdir(struct exfat* ef, const struct exfat_node* parent,
 						le32_to_cpu(upcase->start_cluster));
 				goto error;
 			}
-			if (le64_to_cpu(upcase->size) == 0 ||
-				le64_to_cpu(upcase->size) > 0xffff * sizeof(uint16_t) ||
-				le64_to_cpu(upcase->size) % sizeof(uint16_t) != 0)
+			upcase_size = le64_to_cpu(upcase->size);
+			if (upcase_size == 0 ||
+				upcase_size > EXFAT_UPCASE_CHARS * sizeof(uint16_t) ||
+				upcase_size % sizeof(uint16_t) != 0)
 			{
 				exfat_error("bad upcase table size (%"PRIu64" bytes)",
-						le64_to_cpu(upcase->size));
+						upcase_size);
 				goto error;
 			}
-			ef->upcase = malloc(le64_to_cpu(upcase->size));
-			if (ef->upcase == NULL)
+			upcase_comp = malloc(upcase_size);
+			if (upcase_comp == NULL)
 			{
 				exfat_error("failed to allocate upcase table (%"PRIu64" bytes)",
-						le64_to_cpu(upcase->size));
+						upcase_size);
 				rc = -ENOMEM;
 				goto error;
 			}
-			ef->upcase_chars = le64_to_cpu(upcase->size) / sizeof(le16_t);
 
-			if (exfat_pread(ef->dev, ef->upcase, le64_to_cpu(upcase->size),
+			/* read compressed upcase table */
+			if (exfat_pread(ef->dev, upcase_comp, upcase_size,
 					exfat_c2o(ef, le32_to_cpu(upcase->start_cluster))) < 0)
 			{
+				free(upcase_comp);
 				exfat_error("failed to read upper case table "
 						"(%"PRIu64" bytes starting at cluster %#x)",
-						le64_to_cpu(upcase->size),
+						upcase_size,
 						le32_to_cpu(upcase->start_cluster));
 				goto error;
 			}
+
+			/* decompress upcase table */
+			ef->upcase = calloc(EXFAT_UPCASE_CHARS, sizeof(uint16_t));
+			if (ef->upcase == NULL)
+			{
+				free(upcase_comp);
+				exfat_error("failed to allocate decompressed upcase table");
+				rc = -ENOMEM;
+				goto error;
+			}
+			decompress_upcase(ef->upcase, upcase_comp,
+					upcase_size / sizeof(uint16_t));
+			free(upcase_comp);
 			break;
 
 		case EXFAT_ENTRY_BITMAP:
@@ -449,7 +563,7 @@ static int readdir(struct exfat* ef, const struct exfat_node* parent,
 				goto error;
 			}
 			if (utf16_to_utf8(ef->label, label->name,
-						sizeof(ef->label) - 1, EXFAT_ENAME_MAX) != 0)
+						sizeof(ef->label), EXFAT_ENAME_MAX) != 0)
 				goto error;
 			break;
 
@@ -490,7 +604,7 @@ int exfat_cache_directory(struct exfat* ef, struct exfat_node* dir)
 	struct exfat_node* node;
 	struct exfat_node* current = NULL;
 
-	if (dir->flags & EXFAT_ATTRIB_CACHED)
+	if (dir->is_cached)
 		return 0; /* already cached */
 
 	rc = opendir(ef, dir, &it);
@@ -523,7 +637,7 @@ int exfat_cache_directory(struct exfat* ef, struct exfat_node* dir)
 		return rc;
 	}
 
-	dir->flags |= EXFAT_ATTRIB_CACHED;
+	dir->is_cached = true;
 	return 0;
 }
 
@@ -553,7 +667,7 @@ static void tree_detach(struct exfat_node* node)
 
 static void reset_cache(struct exfat* ef, struct exfat_node* node)
 {
-	char buffer[UTF8_BYTES(EXFAT_NAME_MAX) + 1];
+	char buffer[EXFAT_UTF8_NAME_BUFFER_MAX];
 
 	while (node->child)
 	{
@@ -562,16 +676,16 @@ static void reset_cache(struct exfat* ef, struct exfat_node* node)
 		tree_detach(p);
 		free(p);
 	}
-	node->flags &= ~EXFAT_ATTRIB_CACHED;
+	node->is_cached = false;
 	if (node->references != 0)
 	{
-		exfat_get_name(node, buffer, sizeof(buffer) - 1);
+		exfat_get_name(node, buffer);
 		exfat_warn("non-zero reference counter (%d) for '%s'",
 				node->references, buffer);
 	}
-	if (node != ef->root && (node->flags & EXFAT_ATTRIB_DIRTY))
+	if (node != ef->root && node->is_dirty)
 	{
-		exfat_get_name(node, buffer, sizeof(buffer) - 1);
+		exfat_get_name(node, buffer);
 		exfat_bug("node '%s' is dirty", buffer);
 	}
 	while (node->references)
@@ -608,7 +722,7 @@ int exfat_flush_node(struct exfat* ef, struct exfat_node* node)
 	struct exfat_entry_meta1 meta1;
 	struct exfat_entry_meta2 meta2;
 
-	if (!(node->flags & EXFAT_ATTRIB_DIRTY))
+	if (!node->is_dirty)
 		return 0; /* no need to flush */
 
 	if (ef->ro)
@@ -631,7 +745,7 @@ int exfat_flush_node(struct exfat* ef, struct exfat_node* node)
 	}
 	if (meta1.type != EXFAT_ENTRY_FILE)
 		exfat_bug("invalid type of meta1: 0x%hhx", meta1.type);
-	meta1.attrib = cpu_to_le16(node->flags);
+	meta1.attrib = cpu_to_le16(node->attrib);
 	exfat_unix2exfat(node->mtime, &meta1.mdate, &meta1.mtime, &meta1.mtime_cs);
 	exfat_unix2exfat(node->atime, &meta1.adate, &meta1.atime, NULL);
 
@@ -646,7 +760,7 @@ int exfat_flush_node(struct exfat* ef, struct exfat_node* node)
 	meta2.start_cluster = cpu_to_le32(node->start_cluster);
 	meta2.flags = EXFAT_FLAG_ALWAYS1;
 	/* empty files must not be marked as contiguous */
-	if (node->size != 0 && IS_CONTIGUOUS(*node))
+	if (node->size != 0 && node->is_contiguous)
 		meta2.flags |= EXFAT_FLAG_CONTIGUOUS;
 	/* name hash remains unchanged, no need to recalculate it */
 
@@ -663,46 +777,40 @@ int exfat_flush_node(struct exfat* ef, struct exfat_node* node)
 		return -EIO;
 	}
 
-	node->flags &= ~EXFAT_ATTRIB_DIRTY;
+	node->is_dirty = false;
 	return exfat_flush(ef);
 }
 
-static bool erase_entry(struct exfat* ef, struct exfat_node* node)
+static int erase_entries(struct exfat* ef, struct exfat_node* dir, int n,
+		off_t offset)
 {
-	cluster_t cluster = node->entry_cluster;
-	off_t offset = node->entry_offset;
-	int name_entries = DIV_ROUND_UP(utf16_length(node->name), EXFAT_ENAME_MAX);
-	uint8_t entry_type;
+	struct exfat_entry entries[n];
+	int rc;
+	int i;
 
-	entry_type = EXFAT_ENTRY_FILE & ~EXFAT_ENTRY_VALID;
-	if (exfat_pwrite(ef->dev, &entry_type, 1, co2o(ef, cluster, offset)) < 0)
-	{
-		exfat_error("failed to erase meta1 entry");
-		return false;
-	}
+	rc = read_entries(ef, dir, entries, n, offset);
+	if (rc != 0)
+		return rc;
+	for (i = 0; i < n; i++)
+		entries[i].type &= ~EXFAT_ENTRY_VALID;
+	return write_entries(ef, dir, entries, n, offset);
+}
 
-	if (!next_entry(ef, node->parent, &cluster, &offset))
-		return false;
-	entry_type = EXFAT_ENTRY_FILE_INFO & ~EXFAT_ENTRY_VALID;
-	if (exfat_pwrite(ef->dev, &entry_type, 1, co2o(ef, cluster, offset)) < 0)
-	{
-		exfat_error("failed to erase meta2 entry");
-		return false;
-	}
+static int erase_node(struct exfat* ef, struct exfat_node* node)
+{
+	int rc;
 
-	while (name_entries--)
+	exfat_get_node(node->parent);
+	rc = erase_entries(ef, node->parent, 1 + node->continuations,
+			node->entry_offset);
+	if (rc != 0)
 	{
-		if (!next_entry(ef, node->parent, &cluster, &offset))
-			return false;
-		entry_type = EXFAT_ENTRY_FILE_NAME & ~EXFAT_ENTRY_VALID;
-		if (exfat_pwrite(ef->dev, &entry_type, 1,
-				co2o(ef, cluster, offset)) < 0)
-		{
-			exfat_error("failed to erase name entry");
-			return false;
-		}
+		exfat_put_node(ef, node->parent);
+		return rc;
 	}
-	return true;
+	rc = exfat_flush_node(ef, node->parent);
+	exfat_put_node(ef, node->parent);
+	return rc;
 }
 
 static int shrink_directory(struct exfat* ef, struct exfat_node* dir,
@@ -713,9 +821,9 @@ static int shrink_directory(struct exfat* ef, struct exfat_node* dir,
 	uint64_t entries = 0;
 	uint64_t new_size;
 
-	if (!(dir->flags & EXFAT_ATTRIB_DIR))
+	if (!(dir->attrib & EXFAT_ATTRIB_DIR))
 		exfat_bug("attempted to shrink a file");
-	if (!(dir->flags & EXFAT_ATTRIB_CACHED))
+	if (!dir->is_cached)
 		exfat_bug("attempted to shrink uncached directory");
 
 	for (last_node = node = dir->child; node; node = node->next)
@@ -757,21 +865,22 @@ static int delete(struct exfat* ef, struct exfat_node* node)
 	int rc;
 
 	exfat_get_node(parent);
-	if (!erase_entry(ef, node))
+	rc = erase_node(ef, node);
+	if (rc != 0)
 	{
 		exfat_put_node(ef, parent);
-		return -EIO;
+		return rc;
 	}
-	exfat_update_mtime(parent);
 	tree_detach(node);
 	rc = shrink_directory(ef, parent, deleted_offset);
-	node->flags |= EXFAT_ATTRIB_UNLINKED;
+	node->is_unlinked = true;
 	if (rc != 0)
 	{
 		exfat_flush_node(ef, parent);
 		exfat_put_node(ef, parent);
 		return rc;
 	}
+	exfat_update_mtime(parent);
 	rc = exfat_flush_node(ef, parent);
 	exfat_put_node(ef, parent);
 	return rc;
@@ -779,7 +888,7 @@ static int delete(struct exfat* ef, struct exfat_node* node)
 
 int exfat_unlink(struct exfat* ef, struct exfat_node* node)
 {
-	if (node->flags & EXFAT_ATTRIB_DIR)
+	if (node->attrib & EXFAT_ATTRIB_DIR)
 		return -EISDIR;
 	return delete(ef, node);
 }
@@ -788,7 +897,7 @@ int exfat_rmdir(struct exfat* ef, struct exfat_node* node)
 {
 	int rc;
 
-	if (!(node->flags & EXFAT_ATTRIB_DIR))
+	if (!(node->attrib & EXFAT_ATTRIB_DIR))
 		return -ENOTDIR;
 	/* check that directory is empty */
 	rc = exfat_cache_directory(ef, node);
@@ -852,77 +961,62 @@ static int find_slot(struct exfat* ef, struct exfat_node* dir,
 	return 0;
 }
 
-static int write_entry(struct exfat* ef, struct exfat_node* dir,
+static int commit_entry(struct exfat* ef, struct exfat_node* dir,
 		const le16_t* name, cluster_t cluster, off_t offset, uint16_t attrib)
 {
 	struct exfat_node* node;
-	struct exfat_entry_meta1 meta1;
-	struct exfat_entry_meta2 meta2;
 	const size_t name_length = utf16_length(name);
 	const int name_entries = DIV_ROUND_UP(name_length, EXFAT_ENAME_MAX);
+	struct exfat_entry entries[2 + name_entries];
+	struct exfat_entry_meta1* meta1 = (struct exfat_entry_meta1*) &entries[0];
+	struct exfat_entry_meta2* meta2 = (struct exfat_entry_meta2*) &entries[1];
 	int i;
+	int rc;
 
-	node = allocate_node();
-	if (node == NULL)
-		return -ENOMEM;
-	node->entry_cluster = cluster;
-	node->entry_offset = offset;
-	memcpy(node->name, name, name_length * sizeof(le16_t));
+	memset(entries, 0, sizeof(struct exfat_entry[2]));
 
-	memset(&meta1, 0, sizeof(meta1));
-	meta1.type = EXFAT_ENTRY_FILE;
-	meta1.continuations = 1 + name_entries;
-	meta1.attrib = cpu_to_le16(attrib);
-	exfat_unix2exfat(time(NULL), &meta1.crdate, &meta1.crtime,
-			&meta1.crtime_cs);
-	meta1.adate = meta1.mdate = meta1.crdate;
-	meta1.atime = meta1.mtime = meta1.crtime;
-	meta1.mtime_cs = meta1.crtime_cs; /* there is no atime_cs */
-
-	memset(&meta2, 0, sizeof(meta2));
-	meta2.type = EXFAT_ENTRY_FILE_INFO;
-	meta2.flags = EXFAT_FLAG_ALWAYS1;
-	meta2.name_length = name_length;
-	meta2.name_hash = exfat_calc_name_hash(ef, node->name);
-	meta2.start_cluster = cpu_to_le32(EXFAT_CLUSTER_FREE);
+	meta1->type = EXFAT_ENTRY_FILE;
+	meta1->continuations = 1 + name_entries;
+	meta1->attrib = cpu_to_le16(attrib);
+	exfat_unix2exfat(time(NULL), &meta1->crdate, &meta1->crtime,
+			&meta1->crtime_cs);
+	meta1->adate = meta1->mdate = meta1->crdate;
+	meta1->atime = meta1->mtime = meta1->crtime;
+	meta1->mtime_cs = meta1->crtime_cs; /* there is no atime_cs */
 
-	meta1.checksum = exfat_calc_checksum(&meta1, &meta2, node->name);
+	meta2->type = EXFAT_ENTRY_FILE_INFO;
+	meta2->flags = EXFAT_FLAG_ALWAYS1;
+	meta2->name_length = name_length;
+	meta2->name_hash = exfat_calc_name_hash(ef, name, name_length);
+	meta2->start_cluster = cpu_to_le32(EXFAT_CLUSTER_FREE);
+
+	meta1->checksum = exfat_calc_checksum(meta1, meta2, name);
 
-	if (exfat_pwrite(ef->dev, &meta1, sizeof(meta1),
-			co2o(ef, cluster, offset)) < 0)
-	{
-		exfat_error("failed to write meta1 entry");
-		return -EIO;
-	}
-	if (!next_entry(ef, dir, &cluster, &offset))
-		return -EIO;
-	if (exfat_pwrite(ef->dev, &meta2, sizeof(meta2),
-			co2o(ef, cluster, offset)) < 0)
-	{
-		exfat_error("failed to write meta2 entry");
-		return -EIO;
-	}
 	for (i = 0; i < name_entries; i++)
 	{
-		struct exfat_entry_name name_entry = {EXFAT_ENTRY_FILE_NAME, 0};
-		memcpy(name_entry.name, node->name + i * EXFAT_ENAME_MAX,
-				MIN(EXFAT_ENAME_MAX, EXFAT_NAME_MAX - i * EXFAT_ENAME_MAX) *
-				sizeof(le16_t));
-		if (!next_entry(ef, dir, &cluster, &offset))
-			return -EIO;
-		if (exfat_pwrite(ef->dev, &name_entry, sizeof(name_entry),
-				co2o(ef, cluster, offset)) < 0)
-		{
-			exfat_error("failed to write name entry");
-			return -EIO;
-		}
+		struct exfat_entry_name* name_entry;
+
+		name_entry = (struct exfat_entry_name*) &entries[2 + i];
+		name_entry->type = EXFAT_ENTRY_FILE_NAME;
+		name_entry->__unknown = 0;
+		memcpy(name_entry->name, name + i * EXFAT_ENAME_MAX,
+				EXFAT_ENAME_MAX * sizeof(le16_t));
 	}
 
-	init_node_meta1(node, &meta1);
-	init_node_meta2(node, &meta2);
+	rc = write_entries(ef, dir, entries, 2 + name_entries, offset);
+	if (rc != 0)
+		return rc;
+
+	node = allocate_node();
+	if (node == NULL)
+		return -ENOMEM;
+	node->entry_cluster = cluster;
+	node->entry_offset = offset;
+	memcpy(node->name, name, name_length * sizeof(le16_t));
+	init_node_meta1(node, meta1);
+	init_node_meta2(node, meta2);
 
 	tree_attach(dir, node);
-	exfat_update_mtime(dir);
 	return 0;
 }
 
@@ -952,12 +1046,13 @@ static int create(struct exfat* ef, const char* path, uint16_t attrib)
 		exfat_put_node(ef, dir);
 		return rc;
 	}
-	rc = write_entry(ef, dir, name, cluster, offset, attrib);
+	rc = commit_entry(ef, dir, name, cluster, offset, attrib);
 	if (rc != 0)
 	{
 		exfat_put_node(ef, dir);
 		return rc;
 	}
+	exfat_update_mtime(dir);
 	rc = exfat_flush_node(ef, dir);
 	exfat_put_node(ef, dir);
 	return rc;
@@ -1008,6 +1103,7 @@ static int rename_entry(struct exfat* ef, struct exfat_node* dir,
 	off_t old_offset = node->entry_offset;
 	const size_t name_length = utf16_length(name);
 	const int name_entries = DIV_ROUND_UP(name_length, EXFAT_ENAME_MAX);
+	int rc;
 	int i;
 
 	if (exfat_pread(ef->dev, &meta1, sizeof(meta1),
@@ -1025,15 +1121,17 @@ static int rename_entry(struct exfat* ef, struct exfat_node* dir,
 		return -EIO;
 	}
 	meta1.continuations = 1 + name_entries;
-	meta2.name_hash = exfat_calc_name_hash(ef, name);
+	meta2.name_hash = exfat_calc_name_hash(ef, name, name_length);
 	meta2.name_length = name_length;
 	meta1.checksum = exfat_calc_checksum(&meta1, &meta2, name);
 
-	if (!erase_entry(ef, node))
-		return -EIO;
+	rc = erase_node(ef, node);
+	if (rc != 0)
+		return rc;
 
 	node->entry_cluster = new_cluster;
 	node->entry_offset = new_offset;
+	node->continuations = 1 + name_entries;
 
 	if (exfat_pwrite(ef->dev, &meta1, sizeof(meta1),
 			co2o(ef, new_cluster, new_offset)) < 0)
@@ -1093,7 +1191,7 @@ int exfat_rename(struct exfat* ef, const char* old_path, const char* new_path)
 	}
 
 	/* check that target is not a subdirectory of the source */
-	if (node->flags & EXFAT_ATTRIB_DIR)
+	if (node->attrib & EXFAT_ATTRIB_DIR)
 	{
 		struct exfat_node* p;
 
@@ -1113,16 +1211,16 @@ int exfat_rename(struct exfat* ef, const char* old_path, const char* new_path)
 		/* remove target if it's not the same node as source */
 		if (existing != node)
 		{
-			if (existing->flags & EXFAT_ATTRIB_DIR)
+			if (existing->attrib & EXFAT_ATTRIB_DIR)
 			{
-				if (node->flags & EXFAT_ATTRIB_DIR)
+				if (node->attrib & EXFAT_ATTRIB_DIR)
 					rc = exfat_rmdir(ef, existing);
 				else
 					rc = -ENOTDIR;
 			}
 			else
 			{
-				if (!(node->flags & EXFAT_ATTRIB_DIR))
+				if (!(node->attrib & EXFAT_ATTRIB_DIR))
 					rc = exfat_unlink(ef, existing);
 				else
 					rc = -EISDIR;
@@ -1130,6 +1228,16 @@ int exfat_rename(struct exfat* ef, const char* old_path, const char* new_path)
 			exfat_put_node(ef, existing);
 			if (rc != 0)
 			{
+				/* free clusters even if something went wrong; overwise they
+				   will be just lost */
+				exfat_cleanup_node(ef, existing);
+				exfat_put_node(ef, dir);
+				exfat_put_node(ef, node);
+				return rc;
+			}
+			rc = exfat_cleanup_node(ef, existing);
+			if (rc != 0)
+			{
 				exfat_put_node(ef, dir);
 				exfat_put_node(ef, node);
 				return rc;
@@ -1157,19 +1265,19 @@ void exfat_utimes(struct exfat_node* node, const struct timespec tv[2])
 {
 	node->atime = tv[0].tv_sec;
 	node->mtime = tv[1].tv_sec;
-	node->flags |= EXFAT_ATTRIB_DIRTY;
+	node->is_dirty = true;
 }
 
 void exfat_update_atime(struct exfat_node* node)
 {
 	node->atime = time(NULL);
-	node->flags |= EXFAT_ATTRIB_DIRTY;
+	node->is_dirty = true;
 }
 
 void exfat_update_mtime(struct exfat_node* node)
 {
 	node->mtime = time(NULL);
-	node->flags |= EXFAT_ATTRIB_DIRTY;
+	node->is_dirty = true;
 }
 
 const char* exfat_get_label(struct exfat* ef)
@@ -1177,36 +1285,19 @@ const char* exfat_get_label(struct exfat* ef)
 	return ef->label;
 }
 
-static int find_label(struct exfat* ef, cluster_t* cluster, off_t* offset)
+static int find_label(struct exfat* ef, off_t* offset)
 {
-	struct iterator it;
+	struct exfat_entry entry;
 	int rc;
 
-	rc = opendir(ef, ef->root, &it);
-	if (rc != 0)
-		return rc;
-
-	for (;;)
+	for (*offset = 0; ; *offset += sizeof(entry))
 	{
-		if (it.offset >= ef->root->size)
-		{
-			closedir(&it);
-			return -ENOENT;
-		}
+		rc = read_entries(ef, ef->root, &entry, 1, *offset);
+		if (rc != 0)
+			return rc;
 
-		if (get_entry_ptr(ef, &it)->type == EXFAT_ENTRY_LABEL)
-		{
-			*cluster = it.cluster;
-			*offset = it.offset;
-			closedir(&it);
+		if (entry.type == EXFAT_ENTRY_LABEL)
 			return 0;
-		}
-
-		if (!fetch_next_entry(ef, ef->root, &it))
-		{
-			closedir(&it);
-			return -EIO;
-		}
 	}
 }
 
@@ -1219,11 +1310,11 @@ int exfat_set_label(struct exfat* ef, const char* label)
 	struct exfat_entry_label entry;
 
 	memset(label_utf16, 0, sizeof(label_utf16));
-	rc = utf8_to_utf16(label_utf16, label, EXFAT_ENAME_MAX, strlen(label));
+	rc = utf8_to_utf16(label_utf16, label, EXFAT_ENAME_MAX + 1, strlen(label));
 	if (rc != 0)
 		return rc;
 
-	rc = find_label(ef, &cluster, &offset);
+	rc = find_label(ef, &offset);
 	if (rc == -ENOENT)
 		rc = find_slot(ef, ef->root, &cluster, &offset, 1);
 	if (rc != 0)
@@ -1235,12 +1326,10 @@ int exfat_set_label(struct exfat* ef, const char* label)
 	if (entry.length == 0)
 		entry.type ^= EXFAT_ENTRY_VALID;
 
-	if (exfat_pwrite(ef->dev, &entry, sizeof(struct exfat_entry_label),
-			co2o(ef, cluster, offset)) < 0)
-	{
-		exfat_error("failed to write label entry");
-		return -EIO;
-	}
+	rc = write_entries(ef, ef->root, (struct exfat_entry*) &entry, 1, offset);
+	if (rc != 0)
+		return rc;
+
 	strcpy(ef->label, label);
 	return 0;
 }