commit 30a9399cc2f53f320b9c4709ddf347be4dcb3e5b
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 21 15:39:04 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 21 15:39:04 2020 +0000
tree 656c8eaa8d45635a1ac6d26be37aaad7d585a1b0
parent bce80f2539ff25458620415287b4a4f9f1447229
parent 237c9a68fdef0dc10f6b04af42cc747dfdc49217

Merge "init: Fix a bug in MountDir"

init/mount_namespace.cpp

diff --git a/init/mount_namespace.cpp b/init/mount_namespace.cpp
index b811622..1a474fb 100644
--- a/init/mount_namespace.cpp
+++ b/init/mount_namespace.cpp
@@ -107,7 +107,7 @@
 }
 
 static Result<void> MountDir(const std::string& path, const std::string& mount_path) {
-    if (int ret = mkdir(mount_path.c_str(), 0755); ret != 0 && ret != EEXIST) {
+    if (int ret = mkdir(mount_path.c_str(), 0755); ret != 0 && errno != EEXIST) {
         return ErrnoError() << "Could not create mount point " << mount_path;
     }
     if (mount(path.c_str(), mount_path.c_str(), nullptr, MS_BIND, nullptr) != 0) {