From: Zhiqiang Wang <zhiqiang.wang@intel.com>
Date: Wed, 29 Apr 2015 06:10:51 +0000 (+0800)
Subject: os/NewStore: fix the append of the later overlays when doing combination
X-Git-Tag: v9.1.0~242^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cdc652ebbefb927ac338afbfee16f13044bffa18;p=ceph.git

os/NewStore: fix the append of the later overlays when doing combination

The data of the later contiguous overlays should be claim_append to
'op->data', instead of 'bl'.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
---

diff --git a/src/os/newstore/NewStore.cc b/src/os/newstore/NewStore.cc
index bb946f288f47..8c7289a98111 100644
--- a/src/os/newstore/NewStore.cc
+++ b/src/os/newstore/NewStore.cc
@@ -3220,12 +3220,12 @@ int NewStore::_do_write_all_overlays(TransContext *txc,
 
         bl_next_data.substr_of(bl_next, next->second.value_offset,
                                next->second.length);
-        bl.claim_append(bl_next_data);
+        op->data.claim_append(bl_next_data);
         op->length += next->second.length;
-	op->overlays.push_back(next->second);
+        op->overlays.push_back(next->second);
 
-	++prev;
-	++next;
+        ++prev;
+        ++next;
       } else {
 	break;
       }