X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fosd%2FPGLog.cc;h=e85c6cc3333a327ecf9b86ea8b7c71bb84c99bea;hb=31f18b776d001752a193a7cec8bb49033c1a904c;hp=63e1cdfc02629d1eff41e19118303794daa2c558;hpb=40152f1e46a80b3405e5558a442ee632198dfd24;p=ceph.git diff --git a/ceph/src/osd/PGLog.cc b/ceph/src/osd/PGLog.cc index 63e1cdfc0..e85c6cc33 100644 --- a/ceph/src/osd/PGLog.cc +++ b/ceph/src/osd/PGLog.cc @@ -368,7 +368,7 @@ void PGLog::merge_log(pg_info_t &oinfo, pg_log_t &olog, pg_shard_t fromosd, } log.roll_forward_to(log.head, rollbacker); - mempool::osd::list new_entries; + mempool::osd_pglog::list new_entries; new_entries.splice(new_entries.end(), olog.log, from, to); append_log_entries_update_missing( info.last_backfill,