From: Sage Weil <sage@redhat.com>
Date: Tue, 1 Nov 2016 18:05:51 +0000 (-0400)
Subject: common/hobject: use hash field for hash<>
X-Git-Tag: v12.0.1~441^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=304bb1fe40983f9391d8cb310d1508d4dd21cb46;p=ceph.git

common/hobject: use hash field for hash<>

No reason to waste CPU recalculating a hash value!

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

diff --git a/src/common/hobject.h b/src/common/hobject.h
index c2d664243393..14a9ffc7c95d 100644
--- a/src/common/hobject.h
+++ b/src/common/hobject.h
@@ -337,9 +337,8 @@ WRITE_CLASS_ENCODER(hobject_t)
 namespace std {
   template<> struct hash<hobject_t> {
     size_t operator()(const hobject_t &r) const {
-      static hash<object_t> H;
       static rjhash<uint64_t> I;
-      return H(r.oid) ^ I(r.snap);
+      return r.get_hash() ^ I(r.snap);
     }
   };
 } // namespace std
@@ -564,9 +563,8 @@ WRITE_CLASS_ENCODER(ghobject_t)
 namespace std {
   template<> struct hash<ghobject_t> {
     size_t operator()(const ghobject_t &r) const {
-      static hash<object_t> H;
       static rjhash<uint64_t> I;
-      return H(r.hobj.oid) ^ I(r.hobj.snap);
+      return r.hobj.get_hash() ^ I(r.hobj.snap);
     }
   };
 } // namespace std