From d59ca31a4fcc472809b1f1bd3379fc3521c28fb0 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 9 Jun 2016 10:36:31 -0700 Subject: [PATCH] Revert "osd/ReplicatedPG: When do omapclear, it should check object whether is omap." This reverts commit aeb8141c29cdd337961430bbf3e93a79e3e1bcd3. Conflicts: src/osd/ReplicatedPG.cc --- src/osd/ReplicatedPG.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index be65e6ed7146c..2445e23c7d3a4 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -5822,12 +5822,10 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) result = -ENOENT; break; } - if (oi.is_omap()) { - t->omap_clear(soid); - ctx->delta_stats.num_wr++; - obs.oi.clear_omap_digest(); - obs.oi.clear_flag(object_info_t::FLAG_OMAP); - } + t->omap_clear(soid); + ctx->delta_stats.num_wr++; + obs.oi.clear_omap_digest(); + obs.oi.clear_flag(object_info_t::FLAG_OMAP); } break; -- 2.39.5