TBM/tbm-mcu
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mufs: fix an issue when determining the va of a tree object

Browse source
This commit is contained in:
S.J.R. van Schaik 2017-06-09 17:13:51 +02:00
parent 3b25180038
commit d287d7616a
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/fs/mufs/dir.c
View file

@ -169,8 +169,10 @@ static size_t read_dirent(struct mufs *fs, struct mufs_tree *tree,
return 0;
dirent->tree.fs = fs;
dirent->tree.va <<= dev->log2_block_size;
dirent->tree.va |= base & ((UINT32_C(1) << dev->log2_block_size) - 1);
dirent->tree.va = dirent->tree.va << dev->log2_block_size;
/* TODO: get a proper offset to the tree. */
dirent->tree.va += 1;
dirent->tree.va += base & ((UINT32_C(1) << dev->log2_block_size) - 1);
dirent->tree.file_size = entry.file_size;
dirent->tree.root = entry.root;
dirent->tree.depth = entry.depth;
@ -209,8 +211,6 @@ static size_t write_dirent(struct mufs_tree *tree,
dtree.root = tree->root;
dtree.depth = tree->depth;
printf("updating tree->va=%u\n", tree->va);
if (flash_write(tree->fs->dev, tree->va, &dtree, sizeof dtree) == 0)
return 0;
@ -257,8 +257,6 @@ int mufs_mkdir(struct mufs *fs, const char *path)
while (*path == '/')
++path;
printf("path=%s\n", path);
if (!(s = strdup(path)))
return -1;