From 5c4a265514d90f010fc9d21df4de6fa3c75c9171 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 17 Apr 2023 14:53:47 -0700 Subject: [PATCH] snapuserd: Remove dead code from legacy snapuserd. This code is now dead post xor removal. Bug: N/A Test: builds Change-Id: I16e8357b9ee5c731441c57d7a345a4186d5269c2 --- .../libsnapshot/snapuserd/dm-snapshot-merge/snapuserd.cpp | 7 +------ .../snapuserd/dm-snapshot-merge/snapuserd_readahead.cpp | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd.cpp b/fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd.cpp index 89260306c..0a98b18a4 100644 --- a/fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd.cpp +++ b/fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd.cpp @@ -514,10 +514,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; } } @@ -525,9 +523,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(); diff --git a/fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd_readahead.cpp b/fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd_readahead.cpp index 01123f83c..a32c2bfdd 100644 --- a/fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd_readahead.cpp +++ b/fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd_readahead.cpp @@ -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); }