update sources to v12.1.0

[ceph.git] / ceph / src / osd / PGLog.cc

diff --git a/ceph/src/osd/PGLog.cc b/ceph/src/osd/PGLog.cc
index 63e1cdfc02629d1eff41e19118303794daa2c558..e85c6cc3333a327ecf9b86ea8b7c71bb84c99bea 100644 (file)
--- 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<pg_log_entry_t> new_entries;
+    mempool::osd_pglog::list<pg_log_entry_t> new_entries;
     new_entries.splice(new_entries.end(), olog.log, from, to);
     append_log_entries_update_missing(
       info.last_backfill,