Merge "remount: Remove errno test & improve messaging of fs_mgr_overlayfs_mount_all" (7214c98d) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_overlayfs.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}

+3 −4

Original line number	Diff line number	Diff line
		@@ -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.