Merge pull request #508 from littlefs-project/fix-sanity-check

Moved sanity check in lfs_format after compaction
This commit is contained in:
Christopher Haster 2021-01-18 11:47:23 -06:00 committed by GitHub
commit cfe779fc08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

12
lfs.c
View File

@ -3625,12 +3625,6 @@ static int lfs_rawformat(lfs_t *lfs, const struct lfs_config *cfg) {
goto cleanup;
}
// sanity check that fetch works
err = lfs_dir_fetch(lfs, &root, (const lfs_block_t[2]){0, 1});
if (err) {
goto cleanup;
}
// force compaction to prevent accidentally mounting any
// older version of littlefs that may live on disk
root.erased = false;
@ -3638,6 +3632,12 @@ static int lfs_rawformat(lfs_t *lfs, const struct lfs_config *cfg) {
if (err) {
goto cleanup;
}
// sanity check that fetch works
err = lfs_dir_fetch(lfs, &root, (const lfs_block_t[2]){0, 1});
if (err) {
goto cleanup;
}
}
cleanup: