From 590cdc90edaf4f4ff06c97eb2f43b92ab9b60084 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Thu, 25 Jun 2015 16:51:31 -0400 Subject: [PATCH] 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 --- src/librbd/ObjectMap.h | 3 +++ 1 file changed, 3 insertions(+) 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 -- 2.47.3