Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44d025d9 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "libsnapshot: Don't accidentally delete snapshot when collapsing" 

am: 48eb2ee1

Change-Id: Ibe795625cd858e7cf72dc0a7ac4d08bf2f081d7b
parents ab13ed35 48eb2ee1

fs_mgr/libsnapshot/snapshot.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -953,7 +953,7 @@ bool SnapshotManager::CollapseSnapshotDevice(const std::string& name, 
    // flushed remaining I/O. We could in theory replace with dm-zero (or

    // flushed remaining I/O. We could in theory replace with dm-zero (or

    // re-use the table above), but for now it's better to know why this

    // re-use the table above), but for now it's better to know why this

    // would fail.

    // would fail.

    if (!dm.DeleteDeviceIfExists(dm_name)) {

    if (dm_name != name && !dm.DeleteDeviceIfExists(dm_name)) {

        LOG(ERROR) << "Unable to delete snapshot device " << dm_name << ", COW cannot be "

        LOG(ERROR) << "Unable to delete snapshot device " << dm_name << ", COW cannot be "

                   << "reclaimed until after reboot.";

                   << "reclaimed until after reboot.";

        return false;

        return false;