summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2022-05-27 19:06:21 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-05-27 19:06:21 +0000
commit156e28ff02f1428cb51d21a22f81827d7c29cc3f (patch)
treebdf722936f8f7d4efeb014a168915ba601c9cb09
parent254a0556434c4db5970fe3624a1dd7a667147c15 (diff)
parentab9ea463b8899bb0b75c9dc7436a7741d9a92fa9 (diff)
Merge "Fix directory comparison in tryMountDataMirror"
-rw-r--r--cmds/installd/InstalldNativeService.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 3335dc7b72..ee3a67e5fd 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -3505,10 +3505,10 @@ binder::Status InstalldNativeService::tryMountDataMirror(
return error("Failed to stat " + mirrorVolCePath);
}
- if (mirrorCeStat.st_ino == ceStat.st_ino) {
+ if (mirrorCeStat.st_ino == ceStat.st_ino && mirrorCeStat.st_dev == ceStat.st_dev) {
// As it's being called by prepareUserStorage, it can be called multiple times.
// Hence, we if we mount it already, we should skip it.
- LOG(WARNING) << "CE dir is mounted already: " + cePath;
+ LOG(INFO) << "CE dir is mounted already: " + cePath;
return ok();
}