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

Commit 507f185f authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "libsnapshot: Return path if snapshot is already merged" am: 9ae5a6cc am: b3eae7bf 

am: 5e805cdc

Change-Id: I27e948cc5f462a58d324b82f5857bb00d284b9cd
parents a19af7bb 5e805cdc

fs_mgr/libsnapshot/snapshot.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1307,8 +1307,8 @@ bool SnapshotManager::MapPartitionWithSnapshot(LockedFile* lock, 
    // device itself. This device consists of the real blocks in the super

    // partition that this logical partition occupies.

    auto& dm = DeviceMapper::Instance();

    std::string ignore_path;

    if (!CreateLogicalPartition(params, &ignore_path)) {

    std::string base_path;

    if (!CreateLogicalPartition(params, &base_path)) {

        LOG(ERROR) << "Could not create logical partition " << params.GetPartitionName()

                   << " as device " << params.GetDeviceName();

        return false;
@@ -1316,6 +1316,7 @@ bool SnapshotManager::MapPartitionWithSnapshot(LockedFile* lock, 
    created_devices.EmplaceBack<AutoUnmapDevice>(&dm, params.GetDeviceName());



    if (!live_snapshot_status.has_value()) {

        *path = base_path;

        created_devices.Release();

        return true;

    }