commit 6b425bc0b0cd8f5a48fede9ebcfc5b07cf0a7859
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 21 15:53:32 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 21 15:53:32 2020 +0000
tree 656c8eaa8d45635a1ac6d26be37aaad7d585a1b0
parent ae00fb4797a8e318db26cabb5f2852209b7260f1
parent b7d0eaf004d1e049b3d9830833367ca2b5126efd

Merge "init: Fix a bug in MountDir" am: c3d94633a2 am: 5b92e15b99

Change-Id: I4f513909d4abb37d8a61846d785a61feedc24552

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) {