Make multiple FS begin calls noops() SDFS/LittleFS (esp8266#8235)

earlephilhower · web-flow · commit f9084603de55 · 2021-07-26T21:58:40.000+02:00
When LittleFS.begin() or SDFS.begin() is called after the filesystem is already mounted, don't unmount/remount. When an unmount happens, all old Files become invalid (but the core doesn't know this), so you would end up with random crashes in FS code. Now, check for _mounted, and if so just return immediately from begin(). This mimics the original SPIFFS code. Fixes earlephilhower/ESP8266Audio#407
diff --git a/libraries/LittleFS/src/LittleFS.h b/libraries/LittleFS/src/LittleFS.h
@@ -183,6 +183,9 @@ class LittleFSImpl : public FSImpl
     }
 
     bool begin() override {
+        if (_mounted) {
+            return true;
+        }
         if ((_blockSize <= 0) || (_size <= 0)) {
             DEBUGV("LittleFS size is <= zero");
             return false;
diff --git a/libraries/SDFS/src/SDFS.h b/libraries/SDFS/src/SDFS.h
@@ -149,7 +149,7 @@ class SDFSImpl : public FSImpl
 
     bool begin() override {
         if (_mounted) {
-            end();
+            return true;
         }
         _mounted = _fs.begin(_cfg._csPin, _cfg._spiSettings);
         if (!_mounted && _cfg._autoFormat) {

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,9 @@ class LittleFSImpl : public FSImpl`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`bool begin() override {`
	`186`	`+ if (_mounted) {`
	`187`	`+ return true;`
	`188`	`+ }`
`186`	`189`	`if ((_blockSize <= 0) \|\| (_size <= 0)) {`
`187`	`190`	`DEBUGV("LittleFS size is <= zero");`
`188`	`191`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ class SDFSImpl : public FSImpl`
`149`	`149`
`150`	`150`	`bool begin() override {`
`151`	`151`	`if (_mounted) {`
`152`		`- end();`
	`152`	`+ return true;`
`153`	`153`	`}`
`154`	`154`	`_mounted = _fs.begin(_cfg._csPin, _cfg._spiSettings);`
`155`	`155`	`if (!_mounted && _cfg._autoFormat) {`