commit 1b8ddf195fd56415467556d6c44c98c0e96625f6
author NIEJuhu <niejuhu@xiaomi.com> Sun Mar 12 03:38:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Mar 12 03:38:37 2017 +0000
tree b85a81e1d2802382e1b5ddd4236ad8d20434fb6a
parent 5d99f978201f024a8fda4ca4ce54432171912339
parent c832dfb5a3e4807112166e79d16ac9d71e96490b

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

Change-Id: I12fea4ae42c6c7071355911d968432ce5d4e07ee

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