From a371aa51fe012380bd2951742e3f36dcbbcd4116 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Tue, 6 Dec 2016 13:50:20 +0800 Subject: [PATCH] os/bluestore: readability improvements to _do_clone_range() Signed-off-by: xie xingguo --- src/os/bluestore/BlueStore.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 5d892e52e13..89e3da15b55 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -8651,11 +8651,12 @@ int BlueStore::_do_clone_range( } int n = 0; bool dirtied_oldo = false; + uint64_t end = srcoff + length; for (auto ep = oldo->extent_map.seek_lextent(srcoff); ep != oldo->extent_map.extent_map.end(); ++ep) { auto& e = *ep; - if (e.logical_offset >= srcoff + length) { + if (e.logical_offset >= end) { break; } dout(20) << __func__ << " src " << e << dendl; @@ -8696,8 +8697,8 @@ int BlueStore::_do_clone_range( } else { skip_front = 0; } - if (e.logical_offset + e.length > srcoff + length) { - skip_back = e.logical_offset + e.length - (srcoff + length); + if (e.logical_end() > end) { + skip_back = e.logical_end() - end; } else { skip_back = 0; } -- 2.39.5