commit 488525b47ba23b2548f3bf6aa2f4ce6267b2d9b5
author Treehugger Robot <treehugger-gerrit@google.com> Sun Mar 12 03:27:13 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Mar 12 03:27:14 2017 +0000
tree 29b8660239df0b6114270ef4c0abf2c1c00bf8da
parent 76850afa52ded23a03f4ac225edb7fd0f035975c
parent 5c31ffe9cdde8912d2f093e787b52c89c5b5e9b8

Merge "fs_mgr: fix errno setted by mount_with_alternatives"

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