Merge pull request #7578 from ceph/fix-stripper

Stripper: Fix incorrect push_front -> append_zero change Reviewed-by: Jason Dillaman <dillaman@redhat.com>
ceph · Feb 9, 2016 · 278acb6 · 278acb6
2 parents 7731ae9 + 12ea474
commit 278acb6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/osdc/Striper.cc b/src/osdc/Striper.cc
@@ -369,7 +369,9 @@ void Striper::StripedReadResult::assemble_result(CephContext *cct,
     size_t len = p->second.first.length();
     if (len < p->second.second) {
       if (zero_tail || bl.length()) {
-	bl.append_zero(p->second.second - len);
+        bufferptr bp(p->second.second - len);
+        bp.zero();
+        bl.push_front(std::move(bp));
 	bl.claim_prepend(p->second.first);
       } else {
 	bl.claim_prepend(p->second.first);