commit aee87ad4bdac6c91e340e3c3729236b400d1a69f
author Daniel Rosenberg <drosen@google.com> Wed Jan 16 20:23:33 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 16 20:23:33 2019 -0800
tree 499e50c3044185a585f6f4eb752b9452c3fa138c
parent e666780f505ff232f51716cc8c481a81ea8006be
parent 08b9dc7f0ae1a211c772bdabf4945ce25c9c8518

Merge "Retry mounts on -EAGAIN"
am: ccb06c7b2b

Change-Id: I7f8609724b7bab07892401fbb102228058606d55

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 785f9a2..19445c8 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -556,9 +556,17 @@
     mkdir(target.c_str(), 0755);
     errno = 0;
     unsigned long mountflags = entry.flags;
-    int ret = mount(source.c_str(), target.c_str(), entry.fs_type.c_str(), mountflags,
+    int ret = 0;
+    int save_errno = 0;
+    do {
+        if (save_errno == EAGAIN) {
+            PINFO << "Retrying mount (source=" << source << ",target=" << target
+                  << ",type=" << entry.fs_type << ")=" << ret << "(" << save_errno << ")";
+        }
+        ret = mount(source.c_str(), target.c_str(), entry.fs_type.c_str(), mountflags,
                     entry.fs_options.c_str());
-    int save_errno = errno;
+        save_errno = errno;
+    } while (ret && save_errno == EAGAIN);
     const char* target_missing = "";
     const char* source_missing = "";
     if (save_errno == ENOENT) {