From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 25 Jun 2015 20:51:31 +0000 (-0400)
Subject: librbd: prevent object map updates from being interrupted
X-Git-Tag: v9.0.2~7^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=590cdc90edaf4f4ff06c97eb2f43b92ab9b60084;p=ceph.git

librbd: prevent object map updates from being interrupted

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>
---

diff --git a/src/librbd/ObjectMap.h b/src/librbd/ObjectMap.h
index 94c48dfb0b87..abcf7372d326 100644
--- a/src/librbd/ObjectMap.h
+++ b/src/librbd/ObjectMap.h
@@ -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