commit 8d425af3a5ae61566ab3e9ef60dd9d4539864140
author NIEJuhu <niejuhu@xiaomi.com> Sun Mar 12 03:30:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Mar 12 03:30:37 2017 +0000
tree 62bdbc73743cc8e25ed38b5fdfd92374caef63c0
parent 86505c3f9900246cfbb80a890435829cea018853
parent 5bb957e514685c876ae69fca92ea5c7c763dbb88

Merge "fs_mgr: fix errno setted by mount_with_alternatives"
am: 488525b47b

Change-Id: I4aaba5b3a047b3a6d2cf24557794ec45c007eb13

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index d0e4682..6c84d73 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -563,8 +563,10 @@
                 }
             } else {
                 fs_stat |= FS_STAT_FULL_MOUNT_FAILED;
-                /* back up errno for crypto decisions */
-                mount_errno = errno;
+                /* back up the first errno for crypto decisions */
+                if (mount_errno == 0) {
+                    mount_errno = errno;
+                }
             }
             log_fs_stat(fstab->recs[i].blk_device, fs_stat);
     }