commit e69b2d427754fa1d9d2758c8068f0adda75095bf
author Akilesh Kailash <akailash@google.com> Tue Oct 08 20:53:06 2024 -0700
committer Akilesh Kailash <akailash@google.com> Wed Oct 09 04:37:47 2024 +0000
tree e03313361a895b2f31dd52b4cd34290450393b8f
parent 5684f3e059d01945708d388d1982be5cd558bbb2

snapshotctl: Initialize snapshot pointer when reverting snapshots

Test: snapshotctl revert-snapshots
Bug: 368487904
Change-Id: I9743bf412d4bfcf508aeb046ec329568da4e2be1
Signed-off-by: Akilesh Kailash <akailash@google.com>

fs_mgr/libsnapshot/snapshotctl.cpp

diff --git a/fs_mgr/libsnapshot/snapshotctl.cpp b/fs_mgr/libsnapshot/snapshotctl.cpp
index 97a8cb2..46de991 100644
--- a/fs_mgr/libsnapshot/snapshotctl.cpp
+++ b/fs_mgr/libsnapshot/snapshotctl.cpp
@@ -105,7 +105,7 @@
     bool FinishSnapshotWrites();
     bool UnmapCowImagePath(std::string& name);
     bool DeleteSnapshots();
-    bool CleanupSnapshot() { return sm_->PrepareDeviceToBootWithoutSnapshot(); }
+    bool CleanupSnapshot();
     bool BeginUpdate();
     bool ApplyUpdate();
 
@@ -495,6 +495,11 @@
     return sm_->UnmapCowImage(name);
 }
 
+bool MapSnapshots::CleanupSnapshot() {
+    sm_ = SnapshotManager::New();
+    return sm_->PrepareDeviceToBootWithoutSnapshot();
+}
+
 bool MapSnapshots::DeleteSnapshots() {
     sm_ = SnapshotManager::New();
     lock_ = sm_->LockExclusive();