From 6b3c27fc8a80df50e17ad8955ccd22629ff9fde9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 24 Sep 2019 13:37:37 -0500 Subject: [PATCH] osd/PrimaryLogPG: drop unused MOSDOpReply creation path It is unclear why this path was originally needed, but it does predate the removal of the dual-ack removal, so I expect it was related to that. It is no longer necesarry. Signed-off-by: Sage Weil --- src/osd/PrimaryLogPG.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 90dcc08242103..ca3277da82850 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -3812,13 +3812,7 @@ void PrimaryLogPG::execute_ctx(OpContext *ctx) if (m && !ctx->sent_reply) { MOSDOpReply *reply = ctx->reply; - if (reply) - ctx->reply = nullptr; - else { - reply = new MOSDOpReply(m, 0, get_osdmap_epoch(), 0, true); - reply->set_reply_versions(ctx->at_version, - ctx->user_at_version); - } + ctx->reply = nullptr; reply->add_flags(CEPH_OSD_FLAG_ACK | CEPH_OSD_FLAG_ONDISK); dout(10) << " sending reply on " << *m << " " << reply << dendl; osd->send_message_osd_client(reply, m->get_connection()); -- 2.39.5