}
else if (node->references == 0 && node != ef->root)
{
- if (node->flags & EXFAT_ATTRIB_DIRTY)
+ if (node->is_dirty)
{
exfat_get_name(node, buffer);
exfat_warn("dirty node '%s' with zero references", buffer);
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);
return rc;
}
-/**
- * Cluster + offset from the beginning of the directory to absolute offset.
- */
-static off_t co2o(struct exfat* ef, cluster_t cluster, off_t offset)
-{
- return exfat_c2o(ef, cluster) + offset % CLUSTER_SIZE(*ef->sb);
-}
-
static int opendir(struct exfat* ef, const struct exfat_node* dir,
struct iterator* it)
{
char buffer[EXFAT_UTF8_NAME_BUFFER_MAX];
- if (!(dir->flags & EXFAT_ATTRIB_DIR))
+ if (!(dir->attrib & EXFAT_ATTRIB_DIR))
{
exfat_get_name(dir, buffer);
exfat_bug("'%s' is not a directory", buffer);
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));
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 */
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,
}
/* Empty file or directory must be marked as non-contiguous. */
- if (node->size == 0 && (node->flags & EXFAT_ATTRIB_CONTIGUOUS))
+ if (node->size == 0 && node->is_contiguous)
{
exfat_get_name(node, buffer);
- exfat_error("'%s' is empty but marked as contiguous (%#x)", buffer,
- node->flags);
+ 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->flags & EXFAT_ATTRIB_DIR) && node->size % cluster_size != 0)
+ 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,
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);
return rc;
}
- dir->flags |= EXFAT_ATTRIB_CACHED;
+ dir->is_cached = true;
return 0;
}
tree_detach(p);
free(p);
}
- node->flags &= ~EXFAT_ATTRIB_CACHED;
+ node->is_cached = false;
if (node->references != 0)
{
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);
exfat_bug("node '%s' is dirty", buffer);
reset_cache(ef, ef->root);
}
-static bool next_entry(struct exfat* ef, const struct exfat_node* parent,
- cluster_t* cluster, off_t* offset)
-{
- *offset += sizeof(struct exfat_entry);
- if (*offset % CLUSTER_SIZE(*ef->sb) == 0)
- {
- *cluster = exfat_next_cluster(ef, parent, *cluster);
- if (CLUSTER_INVALID(*cluster))
- {
- exfat_error("invalid cluster %#x while getting next entry",
- *cluster);
- return false;
- }
- }
- return true;
-}
-
int exfat_flush_node(struct exfat* ef, struct exfat_node* node)
{
- cluster_t cluster;
- off_t offset;
- off_t meta1_offset, meta2_offset;
- struct exfat_entry_meta1 meta1;
- struct exfat_entry_meta2 meta2;
+ struct exfat_entry entries[2];
+ struct exfat_entry_meta1* meta1 = (struct exfat_entry_meta1*) &entries[0];
+ struct exfat_entry_meta2* meta2 = (struct exfat_entry_meta2*) &entries[1];
+ int rc;
- if (!(node->flags & EXFAT_ATTRIB_DIRTY))
+ if (!node->is_dirty)
return 0; /* no need to flush */
if (ef->ro)
if (node->parent == NULL)
return 0; /* do not flush unlinked node */
- cluster = node->entry_cluster;
- offset = node->entry_offset;
- meta1_offset = co2o(ef, cluster, offset);
- if (!next_entry(ef, node->parent, &cluster, &offset))
- return -EIO;
- meta2_offset = co2o(ef, cluster, offset);
+ rc = read_entries(ef, node->parent, entries, 2, node->entry_offset);
+ if (rc != 0)
+ return rc;
- if (exfat_pread(ef->dev, &meta1, sizeof(meta1), meta1_offset) < 0)
+ if (meta1->type != EXFAT_ENTRY_FILE)
{
- exfat_error("failed to read meta1 entry on flush");
+ exfat_error("invalid type of meta1: %#hhx", meta1->type);
return -EIO;
}
- if (meta1.type != EXFAT_ENTRY_FILE)
- exfat_bug("invalid type of meta1: 0x%hhx", meta1.type);
- meta1.attrib = cpu_to_le16(node->flags);
- exfat_unix2exfat(node->mtime, &meta1.mdate, &meta1.mtime, &meta1.mtime_cs);
- exfat_unix2exfat(node->atime, &meta1.adate, &meta1.atime, NULL);
+ 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);
- if (exfat_pread(ef->dev, &meta2, sizeof(meta2), meta2_offset) < 0)
+ if (meta2->type != EXFAT_ENTRY_FILE_INFO)
{
- exfat_error("failed to read meta2 entry on flush");
+ exfat_error("invalid type of meta2: %#hhx", meta2->type);
return -EIO;
}
- if (meta2.type != EXFAT_ENTRY_FILE_INFO)
- exfat_bug("invalid type of meta2: 0x%hhx", meta2.type);
- meta2.size = meta2.valid_size = cpu_to_le64(node->size);
- meta2.start_cluster = cpu_to_le32(node->start_cluster);
- meta2.flags = EXFAT_FLAG_ALWAYS1;
+ meta2->size = meta2->valid_size = cpu_to_le64(node->size);
+ 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))
- meta2.flags |= EXFAT_FLAG_CONTIGUOUS;
+ if (node->size != 0 && node->is_contiguous)
+ meta2->flags |= EXFAT_FLAG_CONTIGUOUS;
/* name hash remains unchanged, no need to recalculate it */
- meta1.checksum = exfat_calc_checksum(&meta1, &meta2, node->name);
+ meta1->checksum = exfat_calc_checksum(meta1, meta2, node->name);
- if (exfat_pwrite(ef->dev, &meta1, sizeof(meta1), meta1_offset) < 0)
- {
- exfat_error("failed to write meta1 entry on flush");
- return -EIO;
- }
- if (exfat_pwrite(ef->dev, &meta2, sizeof(meta2), meta2_offset) < 0)
- {
- exfat_error("failed to write meta2 entry on flush");
- return -EIO;
- }
+ rc = write_entries(ef, node->parent, entries, 2, node->entry_offset);
+ if (rc != 0)
+ return rc;
- 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,
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)
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;
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);
}
{
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);
return delete(ef, node);
}
-static int grow_directory(struct exfat* ef, struct exfat_node* dir,
- uint64_t asize, uint32_t difference)
+static int check_slot(struct exfat* ef, struct exfat_node* dir, off_t offset,
+ int n)
{
- return exfat_truncate(ef, dir,
- DIV_ROUND_UP(asize + difference, CLUSTER_SIZE(*ef->sb))
- * CLUSTER_SIZE(*ef->sb), true);
+ struct exfat_entry entries[n];
+ int rc;
+ size_t i;
+
+ /* Root directory contains entries, that don't have any nodes associated
+ with them (clusters bitmap, upper case table, label). We need to be
+ careful not to overwrite them. */
+ if (dir != ef->root)
+ return 0;
+
+ rc = read_entries(ef, dir, entries, n, offset);
+ if (rc != 0)
+ return rc;
+ for (i = 0; i < n; i++)
+ if (entries[i].type & EXFAT_ENTRY_VALID)
+ return -EINVAL;
+ return 0;
}
static int find_slot(struct exfat* ef, struct exfat_node* dir,
- cluster_t* cluster, off_t* offset, int subentries)
+ off_t* offset, int n)
{
- struct iterator it;
- int rc;
- const struct exfat_entry* entry;
+ bitmap_t* dmap;
+ struct exfat_node* p;
+ size_t i;
int contiguous = 0;
- rc = opendir(ef, dir, &it);
- if (rc != 0)
- return rc;
- for (;;)
+ if (!dir->is_cached)
+ exfat_bug("directory is not cached");
+
+ /* build a bitmap of valid entries in the directory */
+ dmap = calloc(BMAP_SIZE(dir->size / sizeof(struct exfat_entry)),
+ sizeof(bitmap_t));
+ if (dmap == NULL)
+ {
+ exfat_error("failed to allocate directory bitmap (%"PRIu64")",
+ dir->size / sizeof(struct exfat_entry));
+ return -ENOMEM;
+ }
+ for (p = dir->child; p != NULL; p = p->next)
+ for (i = 0; i < 1 + p->continuations; i++)
+ BMAP_SET(dmap, p->entry_offset / sizeof(struct exfat_entry) + i);
+
+ /* find a slot in the directory entries bitmap */
+ for (i = 0; i < dir->size / sizeof(struct exfat_entry); i++)
{
- if (contiguous == 0)
+ if (BMAP_GET(dmap, i) == 0)
{
- *cluster = it.cluster;
- *offset = it.offset;
+ if (contiguous++ == 0)
+ *offset = (off_t) i * sizeof(struct exfat_entry);
+ if (contiguous == n)
+ /* suitable slot is found, check that it's not occupied */
+ switch (check_slot(ef, dir, *offset, n))
+ {
+ case 0:
+ free(dmap);
+ return 0;
+ case -EIO:
+ free(dmap);
+ return -EIO;
+ case -EINVAL:
+ /* slot is occupied, continue searching */
+ contiguous = 0;
+ break;
+ }
}
- entry = get_entry_ptr(ef, &it);
- if (entry->type & EXFAT_ENTRY_VALID)
- contiguous = 0;
else
- contiguous++;
- if (contiguous == subentries)
- break; /* suitable slot is found */
- if (it.offset + sizeof(struct exfat_entry) >= dir->size)
- {
- rc = grow_directory(ef, dir, dir->size,
- (subentries - contiguous) * sizeof(struct exfat_entry));
- if (rc != 0)
- {
- closedir(&it);
- return rc;
- }
- }
- if (!fetch_next_entry(ef, dir, &it))
- {
- closedir(&it);
- return -EIO;
- }
+ contiguous = 0;
}
- closedir(&it);
- return 0;
+ free(dmap);
+
+ /* no suitable slots found, extend the directory */
+ if (contiguous == 0)
+ *offset = dir->size;
+ return exfat_truncate(ef, dir,
+ ROUND_UP(dir->size + sizeof(struct exfat_entry[n - contiguous]),
+ CLUSTER_SIZE(*ef->sb)),
+ true);
}
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;
+
+ memset(entries, 0, sizeof(struct exfat_entry[2]));
+
+ 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 */
+
+ 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);
+
+ for (i = 0; i < name_entries; i++)
+ {
+ 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));
+ }
+
+ rc = write_entries(ef, dir, entries, 2 + name_entries, offset);
+ if (rc != 0)
+ return rc;
node = allocate_node();
if (node == NULL)
node->entry_cluster = cluster;
node->entry_offset = offset;
memcpy(node->name, name, name_length * sizeof(le16_t));
-
- 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, name_length);
- meta2.start_cluster = cpu_to_le32(EXFAT_CLUSTER_FREE);
-
- meta1.checksum = exfat_calc_checksum(&meta1, &meta2, node->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;
- }
- }
-
- init_node_meta1(node, &meta1);
- init_node_meta2(node, &meta2);
+ init_node_meta1(node, meta1);
+ init_node_meta2(node, meta2);
tree_attach(dir, node);
- exfat_update_mtime(dir);
return 0;
}
return -EEXIST;
}
- rc = find_slot(ef, dir, &cluster, &offset,
+ rc = find_slot(ef, dir, &offset,
2 + DIV_ROUND_UP(utf16_length(name), EXFAT_ENAME_MAX));
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;
struct exfat_node* node, const le16_t* name, cluster_t new_cluster,
off_t new_offset)
{
- struct exfat_entry_meta1 meta1;
- struct exfat_entry_meta2 meta2;
- cluster_t old_cluster = node->entry_cluster;
- 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);
+ 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 rc;
int i;
- if (exfat_pread(ef->dev, &meta1, sizeof(meta1),
- co2o(ef, old_cluster, old_offset)) < 0)
- {
- exfat_error("failed to read meta1 entry on rename");
- return -EIO;
- }
- if (!next_entry(ef, node->parent, &old_cluster, &old_offset))
- return -EIO;
- if (exfat_pread(ef->dev, &meta2, sizeof(meta2),
- co2o(ef, old_cluster, old_offset)) < 0)
- {
- exfat_error("failed to read meta2 entry on rename");
- return -EIO;
- }
- meta1.continuations = 1 + name_entries;
- meta2.name_hash = exfat_calc_name_hash(ef, name, name_length);
- meta2.name_length = name_length;
- meta1.checksum = exfat_calc_checksum(&meta1, &meta2, name);
+ rc = read_entries(ef, node->parent, entries, 2, node->entry_offset);
+ if (rc != 0)
+ return rc;
- if (!erase_entry(ef, node))
- return -EIO;
+ meta1->continuations = 1 + name_entries;
+ meta2->name_length = name_length;
+ meta2->name_hash = exfat_calc_name_hash(ef, name, name_length);
+ meta1->checksum = exfat_calc_checksum(meta1, meta2, name);
+
+ rc = erase_node(ef, node);
+ if (rc != 0)
+ return rc;
node->entry_cluster = new_cluster;
node->entry_offset = new_offset;
-
- if (exfat_pwrite(ef->dev, &meta1, sizeof(meta1),
- co2o(ef, new_cluster, new_offset)) < 0)
- {
- exfat_error("failed to write meta1 entry on rename");
- return -EIO;
- }
- if (!next_entry(ef, dir, &new_cluster, &new_offset))
- return -EIO;
- if (exfat_pwrite(ef->dev, &meta2, sizeof(meta2),
- co2o(ef, new_cluster, new_offset)) < 0)
- {
- exfat_error("failed to write meta2 entry on rename");
- return -EIO;
- }
+ node->continuations = 1 + name_entries;
for (i = 0; i < name_entries; i++)
{
- struct exfat_entry_name name_entry = {EXFAT_ENTRY_FILE_NAME, 0};
- memcpy(name_entry.name, name + i * EXFAT_ENAME_MAX,
+ 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));
- if (!next_entry(ef, dir, &new_cluster, &new_offset))
- return -EIO;
- if (exfat_pwrite(ef->dev, &name_entry, sizeof(name_entry),
- co2o(ef, new_cluster, new_offset)) < 0)
- {
- exfat_error("failed to write name entry on rename");
- return -EIO;
- }
}
+ rc = write_entries(ef, dir, entries, 2 + name_entries, new_offset);
+ if (rc != 0)
+ return rc;
+
memcpy(node->name, name, (EXFAT_NAME_MAX + 1) * sizeof(le16_t));
tree_detach(node);
tree_attach(dir, node);
}
/* 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;
/* 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;
exfat_put_node(ef, existing);
}
- rc = find_slot(ef, dir, &cluster, &offset,
+ rc = find_slot(ef, dir, &offset,
2 + DIV_ROUND_UP(utf16_length(name), EXFAT_ENAME_MAX));
if (rc != 0)
{
return rc;
}
rc = rename_entry(ef, dir, node, name, cluster, offset);
+ if (rc != 0)
+ {
+ exfat_put_node(ef, dir);
+ exfat_put_node(ef, node);
+ return rc;
+ }
+ rc = exfat_flush_node(ef, dir);
exfat_put_node(ef, dir);
exfat_put_node(ef, node);
+ /* node itself is not marked as dirty, no need to flush it */
return rc;
}
{
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)
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;
- }
}
}
{
le16_t label_utf16[EXFAT_ENAME_MAX + 1];
int rc;
- cluster_t cluster;
off_t offset;
struct exfat_entry_label entry;
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);
+ rc = find_slot(ef, ef->root, &offset, 1);
if (rc != 0)
return rc;
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;
}