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

Commit 31e30b58 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "snapuserd: Remove dead code from legacy snapuserd." am: f16b2f79 am: b7f153e1 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2541692



Change-Id: I64112fd4ce4ed8cb59cd9d695f0e61d3f615402b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de05fe1d b7f153e1

fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd.cpp

+1 −6
Original line number Diff line number Diff line
@@ -509,10 +509,8 @@ bool Snapuserd::ReadMetadata() { 
            // in the file.

            //===========================================================

            uint64_t block_source = cow_op->source;

            uint64_t block_offset = 0;

            if (prev_id.has_value()) {

                if (dest_blocks.count(cow_op->new_block) || source_blocks.count(block_source) ||

                    (block_offset > 0 && source_blocks.count(block_source + 1))) {

                if (dest_blocks.count(cow_op->new_block) || source_blocks.count(block_source)) {

                    break;

                }

            }
@@ -520,9 +518,6 @@ bool Snapuserd::ReadMetadata() { 
            pending_ordered_ops -= 1;

            vec.push_back(cow_op);

            dest_blocks.insert(block_source);

            if (block_offset > 0) {

                dest_blocks.insert(block_source + 1);

            }

            source_blocks.insert(cow_op->new_block);

            prev_id = cow_op->new_block;

            cowop_rm_iter->Next();

fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd_readahead.cpp

+1 −6
Original line number Diff line number Diff line
@@ -173,16 +173,11 @@ ReadAheadThread::ReadAheadThread(const std::string& cow_device, const std::strin 


void ReadAheadThread::CheckOverlap(const CowOperation* cow_op) {

    uint64_t source_block = cow_op->source;

    uint64_t source_offset = 0;

    if (dest_blocks_.count(cow_op->new_block) || source_blocks_.count(source_block) ||

        (source_offset > 0 && source_blocks_.count(source_block + 1))) {

    if (dest_blocks_.count(cow_op->new_block) || source_blocks_.count(source_block)) {

        overlap_ = true;

    }



    dest_blocks_.insert(source_block);

    if (source_offset > 0) {

        dest_blocks_.insert(source_block + 1);

    }

    source_blocks_.insert(cow_op->new_block);

}