]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
os/bluestore/BlueFS: drop redundant merge logic of pextents
authorxie xingguo <xie.xingguo@zte.com.cn>
Tue, 26 Sep 2017 11:28:04 +0000 (19:28 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Tue, 26 Sep 2017 13:45:54 +0000 (21:45 +0800)
As Allocator will handle it automatically and efficiently!

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/os/bluestore/BlueFS.cc

index fdbb493abb93fe2ee16c84ddd9c3931b3908efeb..0805f843ad33a0ae9fa737711b8ddb2befe61a0e 100644 (file)
@@ -1846,14 +1846,7 @@ int BlueFS::_allocate(uint8_t id, uint64_t len,
   }
 
   for (auto& p : extents) {
-    bluefs_extent_t e = bluefs_extent_t(id, p.offset, p.length);
-    if (!ev->empty() &&
-       ev->back().bdev == e.bdev &&
-       ev->back().end() == (uint64_t) e.offset) {
-      ev->back().length += e.length;
-    } else {
-      ev->push_back(e);
-    }
+    ev->push_back(bluefs_extent_t(id, p.offset, p.length));
   }
    
   return 0;