Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0

1 files changed, 11 insertions, 0 deletions

diff --git a/Volume.cpp b/Volume.cpp
index c6fb130..4196b2f 100644
--- a/Volume.cpp
+++ b/Volume.cpp
@@ -531,6 +531,16 @@ int Volume::mountVol() {
                 }
 
             } else if (strcmp(fstype, "f2fs") == 0) {
+                /*
+                 * fsck.f2fs does not fix any inconsistencies "yet".
+                 *
+                 * Disable fsck routine as this is just wasting time
+                 * consumed to mount f2fs volumes.
+                 *
+                 * The kernel can determine if a f2fs volume is too damaged
+                 * that it shouldn't get mounted.
+                 */
+                #if 0
                 if (F2FS::check(devicePath)) {
                     errno = EIO;
                     /* Badness - abort the mount */
@@ -539,6 +549,7 @@ int Volume::mountVol() {
                     free(fstype);
                     return -1;
                 }
+                #endif
 
                 if (F2FS::doMount(devicePath, getMountpoint(), false, false, false, true)) {
                     SLOGE("%s failed to mount via F2FS (%s)\n", devicePath, strerror(errno));