]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
librbd: prevent object map updates from being interrupted 5080/head
authorJason Dillaman <dillaman@redhat.com>
Thu, 25 Jun 2015 20:51:31 +0000 (16:51 -0400)
committerJason Dillaman <dillaman@redhat.com>
Thu, 25 Jun 2015 20:51:31 +0000 (16:51 -0400)
Object map updates were being canceled in-flight when the exclusive lock
is released.  This resulted in an ERESTART error code bubbling up to
AioRequest.

Fixes: 12165
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/librbd/ObjectMap.h

index 94c48dfb0b87b9e8b30771424d0b5c5071899c47..abcf7372d32622a061c3af4b079ffcfe5070bbe9 100644 (file)
@@ -71,6 +71,9 @@ private:
   protected:
     const uint64_t m_snap_id;
 
+    virtual bool safely_cancel(int r) {
+      return false;
+    }
     virtual bool should_complete(int r);
     virtual int filter_return_code(int r) {
       // never propagate an error back to the caller