]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
common: ghobject get_filestore_key* use hobject counterpart
authorLoic Dachary <loic@dachary.org>
Fri, 27 Sep 2013 13:34:18 +0000 (15:34 +0200)
committerLoic Dachary <loic@dachary.org>
Wed, 2 Oct 2013 07:15:53 +0000 (09:15 +0200)
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>
src/common/hobject.h

index e483b664347d307113f74865d09579d8ad77a810..46fc67b893a47e4b82a75e8ddb41ca3eab50502b 100644 (file)
@@ -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.