From 8232feb85554b8333ea314f7ec28c9d54d28b136 Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Sun, 6 Mar 2016 01:23:04 +0800 Subject: [PATCH] [thin_scan] Cleanup: remove unnecessary variables --- thin-provisioning/thin_scan.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/thin-provisioning/thin_scan.cc b/thin-provisioning/thin_scan.cc index 725c3b6..1ed7a6b 100644 --- a/thin-provisioning/thin_scan.cc +++ b/thin-provisioning/thin_scan.cc @@ -152,13 +152,12 @@ namespace { bool is_adjacent_to(block_range const &r) const { block_range const &lhs = begin_ < r.begin_ ? *this : r; block_range const &rhs = begin_ < r.begin_ ? r : *this; - uint64_t common_end = std::min(end_, r.end_); if (size() && r.size() && - rhs.begin_ == common_end && + rhs.begin_ == lhs.end_ && ((!blocknr_begin_ && !r.blocknr_begin_) || (blocknr_begin_ && r.blocknr_begin_ && - *rhs.blocknr_begin_ > *lhs.blocknr_begin_ && + *rhs.blocknr_begin_ >= *lhs.blocknr_begin_ && (*rhs.blocknr_begin_ - *lhs.blocknr_begin_ == rhs.begin_ - lhs.begin_))) && type_ == r.type_ && ref_count_ == r.ref_count_ &&