summaryrefslogtreecommitdiff
path: root/init/mount_namespace.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-01-22 04:22:18 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-01-22 04:22:18 +0000
commitdd7b0034f18fe2adb98d89bc2d4eeaa7dbd099a2 (patch)
treef7681478921146427edb73e4e70162d18bdfa0b4 /init/mount_namespace.cpp
parent5e8b40f3bb00ced5da858e373345795c519e74dc (diff)
parentdaec2f4f88253e2e6c9ac38c1903e9ef0e1c07fe (diff)
Snap for 6152176 from daec2f4f88253e2e6c9ac38c1903e9ef0e1c07fe to rvc-release
Change-Id: Icf074761856709508e65f435e25a8f64aeab708d
Diffstat (limited to 'init/mount_namespace.cpp')
-rw-r--r--init/mount_namespace.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/mount_namespace.cpp b/init/mount_namespace.cpp
index b811622c5..1a474fbf3 100644
--- a/init/mount_namespace.cpp
+++ b/init/mount_namespace.cpp
@@ -107,7 +107,7 @@ static bool IsApexUpdatable() {
}
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) {