From: athanatos <rexludorum@gmail.com>
Date: Fri, 4 Oct 2013 21:04:41 +0000 (-0700)
Subject: Merge pull request #692 from ceph/wip-5992-2
X-Git-Tag: v0.71~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce2d9ae6174b5f8fdb0daacf6524a31ea3f93684;p=ceph.git

Merge pull request #692 from ceph/wip-5992-2

Wip 5992 2

Reviewed-by: Sage Weil <sage@inktank.com>
---

ce2d9ae6174b5f8fdb0daacf6524a31ea3f93684
diff --cc src/common/hobject.h
index 82eecf3bfc7b,0a140c3089b8..a769ad060d92
--- a/src/common/hobject.h
+++ b/src/common/hobject.h
@@@ -241,12 -241,20 +241,16 @@@ 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();
    }
  
+   bool is_degenerate() const {
+     return generation == NO_GEN && shard_id == NO_SHARD;
+   }
+ 
    // maximum sorted value.
    static ghobject_t get_max() {
      ghobject_t h(hobject_t::get_max());