Merge "snapshotctl: Initialize snapshot pointer when reverting snapshots" into main (5a6ab7d8) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/snapshotctl.cpp

+6 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ class MapSnapshots {
		bool FinishSnapshotWrites();
		bool UnmapCowImagePath(std::string& name);
		bool DeleteSnapshots();
		bool CleanupSnapshot() { return sm_->PrepareDeviceToBootWithoutSnapshot(); }
		bool CleanupSnapshot();
		bool BeginUpdate();
		bool ApplyUpdate();

		@@ -495,6 +495,11 @@ bool MapSnapshots::UnmapCowImagePath(std::string& name) {
		return sm_->UnmapCowImage(name);
		}

		bool MapSnapshots::CleanupSnapshot() {
		sm_ = SnapshotManager::New();
		return sm_->PrepareDeviceToBootWithoutSnapshot();
		}

		bool MapSnapshots::DeleteSnapshots() {
		sm_ = SnapshotManager::New();
		lock_ = sm_->LockExclusive();