From: Samuel Just <sjust@redhat.com>
Date: Thu, 9 Jun 2016 17:36:44 +0000 (-0700)
Subject: Revert "osd/ReplicatedPG: for copy_get get omap, firstly check ob whether has omap."
X-Git-Tag: v10.2.2~16^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9638%2Fhead;p=ceph.git

Revert "osd/ReplicatedPG: for copy_get get omap, firstly check ob whether has omap."

This reverts commit 771c869651132013054599f3decfc1017092a25f.
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index e53dff66643d..e197864d1817 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -7027,7 +7027,7 @@ int ReplicatedPG::fill_in_copy_get(
 
   // omap
   uint32_t omap_keys = 0;
-  if (!pool.info.supports_omap() || !oi.is_omap()) {
+  if (!pool.info.supports_omap()) {
     cursor.omap_complete = true;
   } else {
     if (left > 0 && !cursor.omap_complete) {