From: Loic Dachary <loic@dachary.org>
Date: Fri, 27 Sep 2013 13:34:18 +0000 (+0200)
Subject: common: ghobject get_filestore_key* use hobject counterpart
X-Git-Tag: v0.71~40^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16fbdcdf9fd4fc28e67104f2cb20ff0e4043d3aa;p=ceph.git

common: ghobject get_filestore_key* use hobject counterpart

The get_filestore_key* methods are changed to just call the
corresponding hobject methods instead of providing an identical
implementation.

Reviewed-by: David Zafman <david.zafman@inktank.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/common/hobject.h b/src/common/hobject.h
index e483b664347d..46fc67b893a4 100644
--- a/src/common/hobject.h
+++ b/src/common/hobject.h
@@ -241,14 +241,10 @@ public:
     return ret;
   }
   filestore_hobject_key_t get_filestore_key_u32() const {
-    assert(!hobj.max);
-    return hobj._reverse_nibbles(hobj.hash);
+    return hobj.get_filestore_key_u32();
   }
   filestore_hobject_key_t get_filestore_key() const {
-    if (hobj.max)
-      return 0x100000000ull;
-    else
-      return get_filestore_key_u32();
+    return hobj.get_filestore_key();
   }
 
   // maximum sorted value.