From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 16 Apr 2020 01:26:40 +0000 (-0400)
Subject: include/denc: replace bufferlist::copy with iterator version
X-Git-Tag: v16.1.0~2567^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06e862bc68c7ebb2b3963f5e07a326ef837cd4fb;p=ceph.git

include/denc: replace bufferlist::copy with iterator version

This version was only compiled as part of ceph-object-corpus
generation, when ENCODE_DUMP_PATH is defined, so it was missed
when bufferlist::copy() was removed.

Fixes: https://tracker.ceph.com/issues/45023
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/src/include/denc.h b/src/include/denc.h
index adb93ad16a1a..dfd5e923d388 100644
--- a/src/include/denc.h
+++ b/src/include/denc.h
@@ -124,7 +124,7 @@ private:
     auto close_fd = make_scope_guard([fd] { ::close(fd); });
     if (auto bl_delta = appender.bl.length() - bl_offset; bl_delta > 0) {
       ceph::bufferlist dump_bl;
-      appender.bl.copy(bl_offset + space_offset, bl_delta - space_offset, dump_bl);
+      appender.bl.begin(bl_offset + space_offset).copy(bl_delta - space_offset, dump_bl);
       const size_t space_len = space_size();
       dump_bl.append(appender.get_pos() - space_len, space_len);
       dump_bl.write_fd(fd);