From d39e00311f0f9aa41d498cb9cfc07e07da91e718 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 10 Apr 2014 17:38:22 -0700 Subject: [PATCH] ReplicatedPG::cancel_flush: requeue dup_ops even if !op Signed-off-by: Samuel Just --- src/osd/ReplicatedPG.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index d061729fc56e9..710046110336e 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -6222,8 +6222,9 @@ void ReplicatedPG::cancel_flush(FlushOpRef fop, bool requeue) Mutex::Locker l(osd->objecter_lock); osd->objecter->op_cancel(fop->objecter_tid, -ECANCELED); } - if (fop->ctx->op && requeue) { - requeue_op(fop->ctx->op); + if (requeue) { + if (fop->ctx->op) + requeue_op(fop->ctx->op); requeue_ops(fop->dup_ops); } if (fop->blocking) { -- 2.39.5