Merge "fs_mgr: fix errno setted by mount_with_alternatives"

am: 488525b47b Change-Id: I4aaba5b3a047b3a6d2cf24557794ec45c007eb13
2017-03-12 03:30:37 +00:00 · 2017-03-12 03:30:37 +00:00 · 21a33342af
parent 2ebb1e5404 488525b47b
commit 21a33342af
1 changed files with 4 additions and 2 deletions
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@ -563,8 +563,10 @@ static int mount_with_alternatives(struct fstab *fstab, int start_idx, int *end_
                }
            } 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);
    }