Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 18:50:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(nvs_flash): Fixed order of page state change to allow recovery

Browse Source
This commit is contained in:
radek.tandler
2026-01-21 14:12:28 +01:00
parent 97013a5166
commit 42b0ade42d
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/nvs_flash/src/nvs_pagemanager.cpp
+13 -10
View File
@@ -163,22 +163,25 @@ esp_err_t PageManager::requestNewPage()
return ESP_ERR_NVS_NOT_ENOUGH_SPACE;
}
esp_err_t err = activatePage();
Page* erasedPage = maxUnusedItemsPageIt;
#ifndef NDEBUG
size_t usedEntries = erasedPage->getUsedEntryCount();
#endif
esp_err_t err = erasedPage->markFreeing();
if (err != ESP_OK) {
return err;
}
// Activating a new page first when markFreeing is done. The data recovery from power loss will be
// driven by the existence of the (transitional) FREEING state of a page.
err = activatePage();
if (err != ESP_OK) {
return err;
}
Page* newPage = &mPageList.back();
Page* erasedPage = maxUnusedItemsPageIt;
#ifndef NDEBUG
size_t usedEntries = erasedPage->getUsedEntryCount();
#endif
err = erasedPage->markFreeing();
if (err != ESP_OK) {
return err;
}
err = erasedPage->copyItems(*newPage);
if (err != ESP_OK && err != ESP_ERR_NVS_NOT_FOUND) {
return err;