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

Wip 5992 2

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

diff --cc src/common/hobject.h
index 82eecf3bfc7b24887266abfcc39af3a7d7f2bf36,0a140c3089b81f9a1be072014e5ca11f2e96a8eb..a769ad060d925989028a68bb5a5a2ff7a1e27331
--- 1/src/common/hobject.h
--- 2/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());

diff --cc src/mon/PGMap.cc
Simple merge

diff --cc src/os/FileStore.cc
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge

diff --cc src/osd/ReplicatedPG.h
Simple merge