From: Samuel Just <sjust@redhat.com>
Date: Thu, 9 Jun 2016 17:36:31 +0000 (-0700)
Subject: Revert "osd/ReplicatedPG: When do omapclear, it should check object whether is omap."
X-Git-Tag: v10.2.2~16^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d59ca31a4fcc472809b1f1bd3379fc3521c28fb0;p=ceph.git

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 be65e6ed714..2445e23c7d3 100644
--- 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;