From: Sage Weil <sage@redhat.com>
Date: Tue, 23 Dec 2014 19:03:17 +0000 (-0800)
Subject: hobject_t: fix get_boundary to work with new sorting regime
X-Git-Tag: v0.94.4~83^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=00d802d97ba5e1a8bde2414f8710494f15807fcd;p=ceph.git

hobject_t: fix get_boundary to work with new sorting regime

The hash is no longer the most significant field; set everything that is
more significant, too.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 45281efad1ae6b2b5ddd5549c56dbdd46671e5c5)
---

diff --git a/src/common/hobject.h b/src/common/hobject.h
index 07ceb3a15ac1..7495cc1ffd17 100644
--- a/src/common/hobject.h
+++ b/src/common/hobject.h
@@ -106,6 +106,7 @@ public:
       return *this;
     hobject_t ret;
     ret.set_hash(hash);
+    ret.pool = pool;
     return ret;
   }
 
@@ -289,6 +290,8 @@ public:
       return *this;
     ghobject_t ret;
     ret.hobj.set_hash(hobj.hash);
+    ret.shard_id = shard_id;
+    ret.hobj.pool = hobj.pool;
     return ret;
   }
   filestore_hobject_key_t get_filestore_key_u32() const {