commit ce3516adb1076e9f3827f11a351f004f91334917
author Ryan Savitski <rsavitski@google.com> Tue Jul 30 12:01:46 2019 +0000
committer Ryan Savitski <rsavitski@google.com> Wed Jul 31 15:03:45 2019 +0000
tree 0065b36cbeb33c1629ef80ae5273d4fa9772bdc6
parent 18c0f37b4f81465e340c5ef0e099e25f567f6ad8

Revert "fs_mgt: Fix remount failure in case of non-overlayfs system"

This reverts commit 588fe9e8af68e943654ab47bfb18cee9587a7332.

Reason for revert: definite cause for test failure

Test: adb-remount-test.sh
Bug: 138407617
Fixes: 138622072
Change-Id: If2fee8873dd7d4360e7ff5572a0481247beffbca

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 2f0bf7d..ac15ce4 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -1009,7 +1009,7 @@
     Fstab candidates;
     for (const auto& entry : fstab) {
         FstabEntry new_entry = entry;
-        if (!fs_mgr_overlayfs_already_mounted(entry.mount_point) ||
+        if (!fs_mgr_overlayfs_already_mounted(entry.mount_point) &&
             !fs_mgr_wants_overlayfs(&new_entry)) {
             continue;
         }