commit cf234dc7e081ac4063c3c5ddcdd4da40c82d51cb
author Paul Lawrence <paullawrence@google.com> Tue Sep 09 10:44:51 2014 -0700
committer Paul Lawrence <paullawrence@google.com> Thu Sep 11 17:31:49 2014 -0700
tree 749d82aeca848cf7ed600162567c2c61938f77a4
parent c3e6eb21b58ae3067ed03358687d1edb851f2abf

Preserve errno from fsmgr_do_mount

Bug: 17358530
Change-Id: I4cd7403c0b7c4f878d6afa5199f998e6f614adb9

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 3f94af5..91e6c33 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -433,7 +433,7 @@
                     char *tmp_mount_point)
 {
     int i = 0;
-    int ret = -1;
+    int ret = FS_MGR_DOMNT_FAILED;
     int mount_errors = 0;
     int first_mount_errno = 0;
     char *m;
@@ -493,7 +493,11 @@
     if (mount_errors) {
         ERROR("Cannot mount filesystem on %s at %s. error: %s\n",
             n_blk_device, m, strerror(first_mount_errno));
-        ret = -1;
+        if (first_mount_errno == EBUSY) {
+            ret = FS_MGR_DOMNT_BUSY;
+        } else {
+            ret = FS_MGR_DOMNT_FAILED;
+        }
     } else {
         /* We didn't find a match, say so and return an error */
         ERROR("Cannot find mount point %s in fstab\n", fstab->recs[i].mount_point);

fs_mgr/include/fs_mgr.h

diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h
index d9c58d4..0c7eb20 100644
--- a/fs_mgr/include/fs_mgr.h
+++ b/fs_mgr/include/fs_mgr.h
@@ -59,6 +59,9 @@
 #define FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED 1
 #define FS_MGR_MNTALL_DEV_NOT_ENCRYPTED 0
 int fs_mgr_mount_all(struct fstab *fstab);
+
+#define FS_MGR_DOMNT_FAILED -1
+#define FS_MGR_DOMNT_BUSY -2
 int fs_mgr_do_mount(struct fstab *fstab, char *n_name, char *n_blk_device,
                     char *tmp_mount_point);
 int fs_mgr_do_tmpfs_mount(char *n_name);