Snap for 14064202 from 12c9505a1d503ff9571e2d6163a724a5f6c96892 to 25Q4-release (78c7b0e3) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -304,9 +304,9 @@ bool SnapshotHandler::Start() {
		if (ra_thread_) {
		ra_thread_status =
		std::async(std::launch::async, &ReadAhead::RunThread, read_ahead_thread_.get());
		// If this is a merge-resume path, wait until RA thread is fully up as
		// the data has to be re-constructed from the scratch space.
		if (resume_merge_ && ShouldReconstructDataFromCow()) {
		// If the data has to be re-constructed from scratch space,
		// wait until RA thread is fully up.
		if (ShouldReconstructDataFromCow()) {
		WaitForRaThreadToStart();
		}
		}

+7 −5

Original line number	Diff line number	Diff line
		@@ -706,11 +706,13 @@ MERGE_GROUP_STATE SnapshotHandler::ProcessMergingBlock(uint64_t new_block, void*
		MERGE_GROUP_STATE state = blk_state->merge_state_;
		switch (state) {
		case MERGE_GROUP_STATE::GROUP_MERGE_PENDING: {
		// If this is a merge-resume path, check if the data is
		// available from scratch space. Data from scratch space takes
		// higher precedence than from source device for overlapping
		// blocks.
		if (resume_merge_ && GetRABuffer(&lock, new_block, buffer)) {
		// When resuming a merge after a crash, a block may have been
		// written to the scratch space and also the base device
		// but not yet committed via CommitMerge().
		// We must check for and prioritize this data
		// from the scratch space over the source block, especially
		// for overlapping blocks or XOR ops.
		if (GetRABuffer(&lock, new_block, buffer)) {
		return (MERGE_GROUP_STATE::GROUP_MERGE_IN_PROGRESS);
		}
		blk_state->num_ios_in_progress += 1; // ref count

+13 −1

Original line number	Diff line number	Diff line
		@@ -276,6 +276,10 @@ cc_library_static {
		],
		recovery_available: false,
		cflags: ["-DMICRODROID=1"],
		cppflags: [
		"-UWORLD_WRITABLE_KMSG",
		"-DWORLD_WRITABLE_KMSG=1",
		],
		}

		phony {
		@@ -343,6 +347,10 @@ cc_binary {
		],
		static_libs: ["libinit.microdroid"],
		cflags: ["-DMICRODROID=1"],
		cppflags: [
		"-UWORLD_WRITABLE_KMSG",
		"-DWORLD_WRITABLE_KMSG=1",
		],
		no_full_install: true,
		visibility: ["//packages/modules/Virtualization/build/microdroid"],
		}
		@@ -494,7 +502,11 @@ cc_binary {
		"avf_build_flags_cc",
		"init_first_stage_defaults",
		],
		cflags: ["-DMICRODROID=1"],
		cflags: [
		"-DMICRODROID=1",
		"-UWORLD_WRITABLE_KMSG",
		"-DWORLD_WRITABLE_KMSG=1",
		],
		no_full_install: true,
		}

+0 −1