commit cf207d082a393b833227d3bc66458005f980b08a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 03 18:41:40 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 03 18:41:40 2018 +0000
tree 7b4bb88a7c00c34f9cc579c29b3c1eacc4495aca
parent e4ab668994f643032c03d46f6eccf9f40af90424
parent 8243f66580d998bfee80d08c53dd01f182dedcf5

Merge "fs_mgr: __mount better detail for ENOENT"

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index d29ccf4..c98e132 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -529,8 +529,18 @@
     errno = 0;
     ret = mount(source, target, rec->fs_type, mountflags, rec->fs_options);
     save_errno = errno;
-    PINFO << __FUNCTION__ << "(source=" << source << ",target=" << target
-          << ",type=" << rec->fs_type << ")=" << ret;
+    const char* target_missing = "";
+    const char* source_missing = "";
+    if (save_errno == ENOENT) {
+        if (access(target, F_OK)) {
+            target_missing = "(missing)";
+        } else if (access(source, F_OK)) {
+            source_missing = "(missing)";
+        }
+        errno = save_errno;
+    }
+    PINFO << __FUNCTION__ << "(source=" << source << source_missing << ",target=" << target
+          << target_missing << ",type=" << rec->fs_type << ")=" << ret;
     if ((ret == 0) && (mountflags & MS_RDONLY) != 0) {
         fs_mgr_set_blk_ro(source);
     }