From: Samuel Just <sjust@redhat.com>
Date: Thu, 23 Jul 2015 22:31:23 +0000 (-0700)
Subject: Revert "osd: set the blocked_by relationship when rolling back to a degraded"
X-Git-Tag: v9.1.0~345^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7107ce07f113653cc1d276da9451314e38a2635;p=ceph.git

Revert "osd: set the blocked_by relationship when rolling back to a degraded"

This reverts commit 48dacd75566f64cb89f991ac4d05e2e50c4e73e0.
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 329cc67dfc84..7d68fe069e5e 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5520,8 +5520,6 @@ int ReplicatedPG::_rollback_to(OpContext *ctx, ceph_osd_op& op)
     if (is_degraded_or_backfilling_object(rollback_to_sobject)) {
       dout(20) << "_rollback_to attempted to roll back to a degraded object "
 	       << rollback_to_sobject << " (requested snapid: ) " << snapid << dendl;
-      ctx->obc->blocked_by = rollback_to;
-      rollback_to->blocking.insert(ctx->obc);
       wait_for_degraded_object(rollback_to_sobject, ctx->op);
       ret = -EAGAIN;
     } else if (rollback_to->obs.oi.soid.snap == CEPH_NOSNAP) {