commit 56c920aed9fbb15d4358268f7e6916a654fee05b
author NIEJuhu <niejuhu@xiaomi.com> Sun Mar 12 03:34:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Mar 12 03:34:37 2017 +0000
tree 62bdbc73743cc8e25ed38b5fdfd92374caef63c0
parent 4ba3f784efb67ebc39aa7591fe8c55df6ba7d1be
parent 21a33342af51a17861bf8c52853f6401c27f6678

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

Change-Id: I6e51f30c5bdb1d5a9c07e8389d1b7328c07509e2

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);
     }