From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 26 Sep 2017 11:28:04 +0000 (+0800)
Subject: os/bluestore/BlueFS: drop redundant merge logic of pextents
X-Git-Tag: v13.0.1~766^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=80e14271dbc127f952802a7ad91077e1b17ac448;p=ceph.git

os/bluestore/BlueFS: drop redundant merge logic of pextents

As Allocator will handle it automatically and efficiently!

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index fdbb493abb93..0805f843ad33 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -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;