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

(chore) updates from PR, we decided not to move forward with changing v1 code since it can be risky. Let's improve the future! Also renamed and moved around a the lookahead free / reset function

Browse Source
This commit is contained in:
Derek Thrasher
2020-03-26 08:47:12 -04:00
committed by Christopher Haster
parent d498b9fb31
commit 5e5b5d8572
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lfs.c
View File

@@ -26,15 +26,6 @@ static inline void lfs_cache_zero(lfs_t *lfs, lfs_cache_t *pcache) {
pcache->block = LFS_BLOCK_NULL; pcache->block = LFS_BLOCK_NULL;
} }
/// Invalidate the lookahead buffer. This is done during mounting and failed traversals ///
static inline void lfs_setup_invalid_lookahead_buffer(lfs_t *lfs)
{
lfs->free.off = lfs->seed % lfs->cfg->block_size;
lfs->free.size = 0;
lfs->free.i = 0;
lfs_alloc_ack(lfs);
}
static int lfs_bd_read(lfs_t *lfs, static int lfs_bd_read(lfs_t *lfs,
const lfs_cache_t *pcache, lfs_cache_t *rcache, lfs_size_t hint, const lfs_cache_t *pcache, lfs_cache_t *rcache, lfs_size_t hint,
lfs_block_t block, lfs_off_t off, lfs_block_t block, lfs_off_t off,
@@ -448,6 +439,19 @@ static int lfs_alloc_lookahead(void *p, lfs_block_t block) {
return 0; return 0;
} }
static void lfs_alloc_ack(lfs_t *lfs) {
lfs->free.ack = lfs->cfg->block_count;
}
/// Invalidate the lookahead buffer. This is done during mounting and failed traversals ///
static void lfs_alloc_reset(lfs_t *lfs)
{
lfs->free.off = lfs->seed % lfs->cfg->block_size;
lfs->free.size = 0;
lfs->free.i = 0;
lfs_alloc_ack(lfs);
}
static int lfs_alloc(lfs_t *lfs, lfs_block_t *block) { static int lfs_alloc(lfs_t *lfs, lfs_block_t *block) {
while (true) { while (true) {
while (lfs->free.i != lfs->free.size) { while (lfs->free.i != lfs->free.size) {
@@ -488,17 +492,12 @@ static int lfs_alloc(lfs_t *lfs, lfs_block_t *block) {
memset(lfs->free.buffer, 0, lfs->cfg->lookahead_size); memset(lfs->free.buffer, 0, lfs->cfg->lookahead_size);
int err = lfs_fs_traverseraw(lfs, lfs_alloc_lookahead, lfs, true); int err = lfs_fs_traverseraw(lfs, lfs_alloc_lookahead, lfs, true);
if (err) { if (err) {
lfs_setup_invalid_lookahead_buffer(lfs); lfs_alloc_reset(lfs);
return err; return err;
} }
} }
} }
static void lfs_alloc_ack(lfs_t *lfs) {
lfs->free.ack = lfs->cfg->block_count;
}
/// Metadata pair and directory operations /// /// Metadata pair and directory operations ///
static lfs_stag_t lfs_dir_getslice(lfs_t *lfs, const lfs_mdir_t *dir, static lfs_stag_t lfs_dir_getslice(lfs_t *lfs, const lfs_mdir_t *dir,
lfs_tag_t gmask, lfs_tag_t gtag, lfs_tag_t gmask, lfs_tag_t gtag,
@@ -3784,7 +3783,7 @@ int lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) {
lfs->gdisk = lfs->gstate; lfs->gdisk = lfs->gstate;
// setup free lookahead // setup free lookahead
lfs_setup_invalid_lookahead_buffer(lfs); lfs_alloc_reset(lfs);
LFS_TRACE("lfs_mount -> %d", 0); LFS_TRACE("lfs_mount -> %d", 0);
return 0; return 0;
@@ -4603,7 +4602,6 @@ static int lfs1_mount(lfs_t *lfs, struct lfs1 *lfs1,
lfs->lfs1->root[1] = LFS_BLOCK_NULL; lfs->lfs1->root[1] = LFS_BLOCK_NULL;
// setup free lookahead // setup free lookahead
// TODO should this also call lfs_setup_invalid_lookahead_buffer(lfs); the free.off is different in the current version of lfs
lfs->free.off = 0; lfs->free.off = 0;
lfs->free.size = 0; lfs->free.size = 0;
lfs->free.i = 0; lfs->free.i = 0;