emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[thin_scan] Cleanup: remove unnecessary variables

Browse Source
This commit is contained in:
Ming-Hung Tsai 2016-03-06 01:23:04 +08:00
parent 9f15c5589f
commit 8232feb855
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
thin-provisioning/thin_scan.cc
View File

@ -152,13 +152,12 @@ namespace {
bool is_adjacent_to(block_range const &r) const { bool is_adjacent_to(block_range const &r) const {
block_range const &lhs = begin_ < r.begin_ ? *this : r; block_range const &lhs = begin_ < r.begin_ ? *this : r;
block_range const &rhs = begin_ < r.begin_ ? r : *this; block_range const &rhs = begin_ < r.begin_ ? r : *this;
uint64_t common_end = std::min(end_, r.end_);
if (size() && r.size() && if (size() && r.size() &&
rhs.begin_ == common_end && rhs.begin_ == lhs.end_ &&
((!blocknr_begin_ && !r.blocknr_begin_) || ((!blocknr_begin_ && !r.blocknr_begin_) ||
(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_))) && (*rhs.blocknr_begin_ - *lhs.blocknr_begin_ == rhs.begin_ - lhs.begin_))) &&
type_ == r.type_ && type_ == r.type_ &&
ref_count_ == r.ref_count_ && ref_count_ == r.ref_count_ &&