Merge "Get the correct fstab entry if there are more than one" into main am: 41d3e8d1e5

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3059764

Change-Id: Ic082f8803bfddf523f6016d4924dbcf9abc036ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kelvin Zhang 2024-04-25 17:24:51 +00:00 committed by Automerger Merge Worker
commit f7c7ae7801

View file

@ -198,7 +198,8 @@ Status cp_commitChanges() {
// Walk mounted file systems // Walk mounted file systems
for (const auto& mount_rec : mounts) { for (const auto& mount_rec : mounts) {
const auto fstab_rec = GetEntryForMountPoint(&fstab_default, mount_rec.mount_point); const auto fstab_rec =
GetEntryForMountPoint(&fstab_default, mount_rec.mount_point, mount_rec.fs_type);
if (!fstab_rec) continue; if (!fstab_rec) continue;
if (fstab_rec->fs_mgr_flags.checkpoint_fs) { if (fstab_rec->fs_mgr_flags.checkpoint_fs) {