tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Get the correct fstab entry if there are more than one

Browse source 
vold currently uses the first fstab entry for moun point /data .
However, if there are multiple fstab entries for /data and the
first one isn't the entry actually being used, checkpoint may fail.

Test: boot a device with ext4 entry placed after f2fs
Bug: 293313353
Change-Id: Id374c622c53fd61047d62743555234d36bd038ec
This commit is contained in:
Kelvin Zhang 2024-04-24 14:15:06 -07:00
parent 7c7fb49a3c
commit fd5eb260c4
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Checkpoint.cpp
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) {