From: Igor Fedotov <ifedotov@suse.com>
Date: Wed, 13 Nov 2019 19:09:53 +0000 (+0300)
Subject: os/bluestore: consolidate extents from the same device only
X-Git-Tag: v14.2.5~78^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=117c8b5ca0130e02be98848b6c323812e271af27;p=ceph.git

os/bluestore: consolidate extents from the same device only

Presumably Fixes: https://tracker.ceph.com/issues/42223

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 20a90698a262905e97bae771b5950af04c00c67a)
---

diff --git a/src/os/bluestore/bluefs_types.h b/src/os/bluestore/bluefs_types.h
index 9c8511711b38c..2e5b97f75c592 100644
--- a/src/os/bluestore/bluefs_types.h
+++ b/src/os/bluestore/bluefs_types.h
@@ -90,6 +90,7 @@ struct bluefs_fnode_t {
   void append_extent(const bluefs_extent_t& ext) {
     if (!extents.empty() &&
 	extents.back().end() == ext.offset &&
+	extents.back().bdev == ext.bdev &&
 	(uint64_t)extents.back().length + (uint64_t)ext.length < 0xffffffff) {
       extents.back().length += ext.length;
     } else {