github-mirrors/thirdparty-littlefs
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-littlefs.git synced 2025-10-31 16:14:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP Removed redundant lfs_scan

Browse Source
This commit is contained in:
Christopher Haster
2018-08-01 01:05:04 -05:00
parent 3bb37d4aaf
commit 14469059bc
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lfs.c
View File

@@ -3007,13 +3007,7 @@ static int lfs_init(lfs_t *lfs, const struct lfs_config *cfg) {
lfs->files = NULL; lfs->files = NULL;
lfs->dirs = NULL; lfs->dirs = NULL;
lfs_globalones(&lfs->globals); lfs_globalones(&lfs->globals);
lfs_globalzero(&lfs->locals);
// scan for any global updates
// TODO rm me? need to grab any inits
int err = lfs_scan(lfs);
if (err) {
return err;
}
return 0; return 0;
} }
@@ -3189,6 +3183,7 @@ int lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) {
lfs->name_size = superblock.name_size; lfs->name_size = superblock.name_size;
} }
// scan for any global updates
err = lfs_scan(lfs); err = lfs_scan(lfs);
if (err) { if (err) {
return err; return err;
@@ -3343,8 +3338,6 @@ int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data) {
*/ */
static int lfs_pred(lfs_t *lfs, const lfs_block_t pair[2], lfs_mdir_t *pdir) { static int lfs_pred(lfs_t *lfs, const lfs_block_t pair[2], lfs_mdir_t *pdir) {
if (lfs_pairisnull(lfs->root)) { if (lfs_pairisnull(lfs->root)) {
// TODO best place for this?
// TODO needed for relocate
return LFS_ERR_NOENT; return LFS_ERR_NOENT;
} }
@@ -3369,7 +3362,6 @@ static int lfs_pred(lfs_t *lfs, const lfs_block_t pair[2], lfs_mdir_t *pdir) {
static int32_t lfs_parent(lfs_t *lfs, const lfs_block_t pair[2], static int32_t lfs_parent(lfs_t *lfs, const lfs_block_t pair[2],
lfs_mdir_t *parent) { lfs_mdir_t *parent) {
if (lfs_pairisnull(lfs->root)) { if (lfs_pairisnull(lfs->root)) {
// TODO best place for this?
return LFS_ERR_NOENT; return LFS_ERR_NOENT;
} }
@@ -3451,14 +3443,12 @@ static int lfs_relocate(lfs_t *lfs,
} }
int lfs_scan(lfs_t *lfs) { int lfs_scan(lfs_t *lfs) {
if (lfs_pairisnull(lfs->root)) { // TODO rm me if (lfs_pairisnull(lfs->root)) {
return 0; return 0;
} }
lfs_mdir_t dir = {.tail = {0, 1}};
lfs_globalzero(&lfs->locals);
// iterate over all directory directory entries // iterate over all directory directory entries
lfs_mdir_t dir = {.tail = {0, 1}};
while (!lfs_pairisnull(dir.tail)) { while (!lfs_pairisnull(dir.tail)) {
int err = lfs_dir_fetch(lfs, &dir, dir.tail); int err = lfs_dir_fetch(lfs, &dir, dir.tail);
if (err) { if (err) {