Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 156e28ff authored by Eric Biggers's avatar Eric Biggers Committed by Gerrit Code Review
Browse files

Merge "Fix directory comparison in tryMountDataMirror"

parents 254a0556 ab9ea463
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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();
    }