From: Josh Durgin <jdurgin@redhat.com>
Date: Sat, 11 Apr 2015 00:56:48 +0000 (-0700)
Subject: Merge pull request #4140 from ceph/wip-rbd-rebuild-object-map
X-Git-Tag: v9.0.1~149
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=458901dfb2992dbe2a2095ac6269b74e71aedc32;p=ceph.git

Merge pull request #4140 from ceph/wip-rbd-rebuild-object-map

rbd: add ability to rebuild corrupt/missing object maps

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

458901dfb2992dbe2a2095ac6269b74e71aedc32
diff --cc src/librbd/ObjectMap.h
index 5f9266031224,0534bacbb392..8f1d16ee33ae
--- a/src/librbd/ObjectMap.h
+++ b/src/librbd/ObjectMap.h
@@@ -58,13 -66,10 +66,14 @@@ private
      }
  
    protected:
+     const uint64_t m_snap_id;
+ 
      virtual bool should_complete(int r);
 +    virtual int filter_return_code(int r) {
 +      // never propagate an error back to the caller
 +      return 0;
 +    }
      virtual void finish(ObjectMap *object_map) = 0;
- 
    private:
      /**
       * <start> ---> STATE_REQUEST ---> <finish>