commit 0c7862b8058c6edbfb3c1e9fd0441a6245fad787
author Mark Salyzyn <salyzyn@google.com> Wed Jul 05 21:58:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 05 21:58:15 2017 +0000
tree 86f468f888952ec668f9e0ed4eedc0051c31308f
parent b0bff4a55ccf611fe1597416cd3fe4f256f09c3c
parent ab6f80c350e025c5c6bd86f389c440d7b6896785

Merge "fs_mgr: report errno string for __mount errors" am: 6333cd0938 am: eef732555d
am: ab6f80c350

Change-Id: I1dcef448c82402404652921f8113b2a576158f57

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index e009383..62de6b6 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -476,10 +476,11 @@
         if ((info.st_mode & S_IFMT) == S_IFLNK)
             unlink(target);
     mkdir(target, 0755);
+    errno = 0;
     ret = mount(source, target, rec->fs_type, mountflags, rec->fs_options);
     save_errno = errno;
-    LINFO << __FUNCTION__ << "(source=" << source << ",target="
-          << target << ",type=" << rec->fs_type << ")=" << ret;
+    PINFO << __FUNCTION__ << "(source=" << source << ",target=" << target
+          << ",type=" << rec->fs_type << ")=" << ret;
     if ((ret == 0) && (mountflags & MS_RDONLY) != 0) {
         fs_mgr_set_blk_ro(source);
     }