]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG: no need to clear repop->*obc
authorSamuel Just <sam.just@inktank.com>
Mon, 28 Oct 2013 20:49:23 +0000 (13:49 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 28 Oct 2013 20:50:06 +0000 (13:50 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h

index b5ce71cb0af5fdc66133f475a5c047cb799ccdfd..4d893a534b1c5e5d45ed6fbc8530e86159dc536a 100644 (file)
@@ -4656,15 +4656,6 @@ void ReplicatedPG::op_applied(RepGather *repop)
   // (logical) local ack.
   int whoami = osd->get_nodeid();
 
-  if (repop->ctx->clone_obc) {
-    repop->ctx->clone_obc = ObjectContextRef();
-  }
-  if (repop->ctx->snapset_obc) {
-    repop->ctx->snapset_obc = ObjectContextRef();
-  }
-
-  repop->src_obc.clear();
-
   if (!repop->aborted) {
     assert(repop->waitfor_ack.count(whoami) ||
           repop->waitfor_disk.count(whoami) == 0);  // commit before ondisk
index 181da6e6bf625f7dbe9935360b1c16dc2c7c4b70..a704df854b0d6ae6c73c447614654ae8a1292020 100644 (file)
@@ -411,7 +411,6 @@ public:
       }
     }
     ~OpContext() {
-      assert(!clone_obc);
       assert(lock_to_release == NONE);
       if (reply)
        reply->put();