Merge branch 'fix/fatfs_f_mount_immediately_after_formatting_v5.2' into 'release/v5.2'

igrr · igrr · commit 3883a17f54f0 · 2024-08-05T20:32:17.000+08:00
fix(vfs): FATFS mount immediately after format if mount failed (v5.2)

See merge request espressif/esp-idf!32380
diff --git a/components/fatfs/vfs/vfs_fat_sdmmc.c b/components/fatfs/vfs/vfs_fat_sdmmc.c
@@ -135,7 +135,7 @@ static esp_err_t s_f_mount(sdmmc_card_t *card, FATFS *fs, const char *drv, uint8
         }
 
         ESP_LOGW(TAG, "mounting again");
-        res = f_mount(fs, drv, 0);
+        res = f_mount(fs, drv, 1);
         if (res != FR_OK) {
             err = ESP_FAIL;
             ESP_LOGD(TAG, "f_mount failed after formatting (%d)", res);
diff --git a/components/fatfs/vfs/vfs_fat_spiflash.c b/components/fatfs/vfs/vfs_fat_spiflash.c
@@ -100,7 +100,7 @@ static esp_err_t s_f_mount_rw(FATFS *fs, const char *drv, const esp_vfs_fat_moun
         ESP_RETURN_ON_FALSE(fresult == FR_OK, ESP_FAIL, TAG, "f_mkfs failed (%d)", fresult);
 
         ESP_LOGI(TAG, "Mounting again");
-        fresult = f_mount(fs, drv, 0);
+        fresult = f_mount(fs, drv, 1);
         ESP_RETURN_ON_FALSE(fresult == FR_OK, ESP_FAIL, TAG, "f_mount failed after formatting (%d)", fresult);
     }
     return ESP_OK;

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ static esp_err_t s_f_mount(sdmmc_card_t card, FATFS fs, const char *drv, uint8`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`ESP_LOGW(TAG, "mounting again");`
`138`		`- res = f_mount(fs, drv, 0);`
	`138`	`+ res = f_mount(fs, drv, 1);`
`139`	`139`	`if (res != FR_OK) {`
`140`	`140`	`err = ESP_FAIL;`
`141`	`141`	`ESP_LOGD(TAG, "f_mount failed after formatting (%d)", res);`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ static esp_err_t s_f_mount_rw(FATFS fs, const char drv, const esp_vfs_fat_moun`
`100`	`100`	`ESP_RETURN_ON_FALSE(fresult == FR_OK, ESP_FAIL, TAG, "f_mkfs failed (%d)", fresult);`
`101`	`101`
`102`	`102`	`ESP_LOGI(TAG, "Mounting again");`
`103`		`- fresult = f_mount(fs, drv, 0);`
	`103`	`+ fresult = f_mount(fs, drv, 1);`
`104`	`104`	`ESP_RETURN_ON_FALSE(fresult == FR_OK, ESP_FAIL, TAG, "f_mount failed after formatting (%d)", fresult);`
`105`	`105`	`}`
`106`	`106`	`return ESP_OK;`