commit 244e581a31da30508648b1a118f864dae491935f
author Yi-Yo Chiang <yochiang@google.com> Tue Sep 12 15:53:19 2023 +0800
committer Yi-Yo Chiang <yochiang@google.com> Tue Sep 12 16:08:30 2023 +0800
tree 8879bf1d60793511abdddee87ccc0a737537bad2
parent 1b547892f62a84f3e3bfad56ac7865002db56a08

fs_mgr: Use /proc/mounts to check if /cache is mounted

The fstab provided by the user/caller might not be the default fstab,
which might not include the /cache mount entry. We should just use the
procfs mount info to determine if /cache is currently mounted.

Bug: 300036012
Test: adb_remount test
Change-Id: I4643d0a21ae21f3513f715de424f0be1fe64ff9e

fs_mgr/fs_mgr_overlayfs_control.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs_control.cpp b/fs_mgr/fs_mgr_overlayfs_control.cpp
index 68576f2..2cc0d2d 100644
--- a/fs_mgr/fs_mgr_overlayfs_control.cpp
+++ b/fs_mgr/fs_mgr_overlayfs_control.cpp
@@ -688,7 +688,7 @@
                 continue;
             }
         } else {
-            if (GetEntryForMountPoint(&fstab, overlay_mount_point) == nullptr) {
+            if (!fs_mgr_overlayfs_already_mounted(overlay_mount_point, false /* overlay */)) {
                 continue;
             }
         }