summaryrefslogtreecommitdiffstats
path: root/src/osdc
diff options
context:
space:
mode:
authorSage Weil <sage@redhat.com>2017-06-07 03:57:04 +0200
committerSage Weil <sage@redhat.com>2017-06-07 16:48:03 +0200
commit85887a7a0a40d338ce537d3323d914bcb90cec91 (patch)
tree27db28b3156aaf2161004c4abf49c46a6eeded8a /src/osdc
parentosd: put pg_log_entry_t::snaps in osd_pglog mempool (diff)
downloadceph-85887a7a0a40d338ce537d3323d914bcb90cec91.tar.xz
ceph-85887a7a0a40d338ce537d3323d914bcb90cec91.zip
osd/osd_types: put pg_log_entry_t::extra_reqids in osd_pglog mempool
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'src/osdc')
-rw-r--r--src/osdc/Objecter.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 2c9ee772431..11319aa0f0b 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -727,7 +727,7 @@ struct ObjectOperation {
uint32_t *out_flags;
uint32_t *out_data_digest;
uint32_t *out_omap_digest;
- vector<pair<osd_reqid_t, version_t> > *out_reqids;
+ mempool::osd_pglog::vector<pair<osd_reqid_t, version_t> > *out_reqids;
uint64_t *out_truncate_seq;
uint64_t *out_truncate_size;
int *prval;
@@ -742,7 +742,7 @@ struct ObjectOperation {
uint32_t *flags,
uint32_t *dd,
uint32_t *od,
- vector<pair<osd_reqid_t, version_t> > *oreqids,
+ mempool::osd_pglog::vector<pair<osd_reqid_t, version_t> > *oreqids,
uint64_t *otseq,
uint64_t *otsize,
int *r)
@@ -817,7 +817,7 @@ struct ObjectOperation {
uint32_t *out_flags,
uint32_t *out_data_digest,
uint32_t *out_omap_digest,
- vector<pair<osd_reqid_t, version_t> > *out_reqids,
+ mempool::osd_pglog::vector<pair<osd_reqid_t, version_t> > *out_reqids,
uint64_t *truncate_seq,
uint64_t *truncate_size,
int *prval) {