From: Sage Weil <sage@redhat.com>
Date: Sat, 28 Mar 2015 00:06:44 +0000 (-0700)
Subject: osd/osd_types: make coll_t operator== less picky
X-Git-Tag: v9.1.0~324^2~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ca0e7c2566d0332c5792163d75e40f4e46836c2;p=ceph.git

osd/osd_types: make coll_t operator== less picky

For meta coll's do not compare pg.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index e70765454417..55a4a9c4b786 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -599,6 +599,11 @@ public:
   void decode(bufferlist::iterator& bl);
 
   inline bool operator==(const coll_t& rhs) const {
+    // only compare type if meta
+    if (type != rhs.type)
+      return false;
+    if (type == TYPE_META)
+      return true;
     return type == rhs.type && pgid == rhs.pgid;
   }
   inline bool operator!=(const coll_t& rhs) const {