Github/littlefs
1
Fork 0
Code Actions Activity

Added v1->v2 migration into CI

Browse Source 
Also fixed issue where migration would not handle large dirs due to v1
iteration changing the pair of the directory.
This commit is contained in:
Christopher Haster
2019-04-01 22:12:08 -05:00
parent bdff4bc59e
commit 9568f8ee2d
2 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.c
+7 -2
View File
@@ -4268,6 +4268,8 @@ int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) {
}
dir2.rev = dir1.d.rev;
dir1.head[0] = dir1.pair[0];
dir1.head[1] = dir1.pair[1];
lfs->root[0] = dir2.pair[0];
lfs->root[1] = dir2.pair[1];
@@ -4368,7 +4370,10 @@ int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) {
// Copy over first block to thread into fs. Unfortunately
// if this fails there is not much we can do.
err = lfs_bd_erase(lfs, dir1.pair[1]);
LFS_DEBUG("Migrating %"PRIu32" %"PRIu32" -> %"PRIu32" %"PRIu32,
lfs->root[0], lfs->root[1], dir1.head[0], dir1.head[1]);
err = lfs_bd_erase(lfs, dir1.head[1]);
if (err) {
goto cleanup;
}
@@ -4389,7 +4394,7 @@ int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) {
err = lfs_bd_prog(lfs,
&lfs->pcache, &lfs->rcache, true,
dir1.pair[1], i, &dat, 1);
dir1.head[1], i, &dat, 1);
if (err) {
goto cleanup;
}