Revert "osd/ReplicatedPG: When do omapclear, it should check object whether is omap."

This reverts commit aeb8141c29cdd337961430bbf3e93a79e3e1bcd3.

Conflicts:
	src/osd/ReplicatedPG.cc

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index be65e6ed7146c4531327368e7daf24911eeacc94..2445e23c7d3a4084c726086e4a2b69b15b49d56e 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5822,12 +5822,10 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& 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;