commit 70d27113d021dcf5c6c0a65d795267621ef2e1eb
author Akilesh Kailash <akailash@google.com> Thu Nov 12 00:45:21 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 12 00:45:21 2020 +0000
tree 3d17c7affe50465ea17649c91443936d082c8b0a
parent 3d0f195bcc5fb7507a31913235e8a0086c729fd3
parent 8ec3fa8aba5fcc96588b766fc25cb28fb7599a81

Merge "libsnapshot: Retrieve base sector for dm-user device creation"

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index e52d8d5..388c296 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -1097,7 +1097,7 @@
 
 static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exists, bool* change) {
     *partition_exists = false;
-    *change = false;
+    if (change) *change = false;
 
     auto images = IImageManager::Open("remount", 10s);
     if (!images) {
@@ -1117,7 +1117,7 @@
         return false;
     }
 
-    *change = true;
+    if (change) *change = true;
 
     // Note: calling RemoveDisabledImages here ensures that we do not race with
     // clean_scratch_files and accidentally try to map an image that will be