ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "remount: Remove errno test & improve messaging of fs_mgr_overlayfs_mount_all" am: 7214c98d2e am: d7d2bab857 am: 0e1b203415

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2228578

Change-Id: If209be23861c277eab3de3bb023d6aa1b5a91dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi-yo Chiang 2022-10-04 07:52:21 +00:00 • committed by Automerger Merge Worker
commit b895be9ec3
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs_mgr/fs_mgr_overlayfs.cpp
View file

@ -1331,22 +1331,22 @@ static void TryMountScratch() {
}
bool fs_mgr_overlayfs_mount_all(Fstab* fstab) {
auto ret = false;
if (fs_mgr_overlayfs_invalid()) return ret;
if (fs_mgr_overlayfs_invalid()) {
return false;
}
auto ret = true;
auto scratch_can_be_mounted = true;
for (const auto& entry : fs_mgr_overlayfs_candidate_list(*fstab)) {
if (fs_mgr_is_verity_enabled(entry)) continue;
auto mount_point = fs_mgr_mount_point(entry.mount_point);
if (fs_mgr_overlayfs_already_mounted(mount_point)) {
ret = true;
continue;
}
if (scratch_can_be_mounted) {
scratch_can_be_mounted = false;
TryMountScratch();
}
if (fs_mgr_overlayfs_mount(mount_point)) ret = true;
ret &= fs_mgr_overlayfs_mount(mount_point);
}
return ret;
}

7
fs_mgr/fs_mgr_remount.cpp
View file

@ -451,10 +451,9 @@ static int do_remount(Fstab& fstab, const std::vector<std::string>& partition_ar
}
// Mount overlayfs.
errno = 0;
if (!fs_mgr_overlayfs_mount_all(&partitions) && errno) {
PLOG(ERROR) << "Can not mount overlayfs for partitions";
return BAD_OVERLAY;
if (!fs_mgr_overlayfs_mount_all(&partitions)) {
LOG(WARNING) << "Cannot mount overlayfs for some partitions";
// Continue regardless to handle raw remount case.
}
// Get actual mounts _after_ overlayfs has been added.