]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PrimaryLogPG: drop unused MOSDOpReply creation path
authorSage Weil <sage@redhat.com>
Tue, 24 Sep 2019 18:37:37 +0000 (13:37 -0500)
committerSage Weil <sage@redhat.com>
Wed, 25 Sep 2019 15:58:31 +0000 (10:58 -0500)
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 <sage@redhat.com>
src/osd/PrimaryLogPG.cc

index 90dcc0824210314ede419b4e3142c9a0aa139e45..ca3277da8285077e84633d9efd39ca9d73deebff 100644 (file)
@@ -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());