From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 25 Nov 2015 16:46:00 +0000 (-0500)
Subject: librbd: ensure object map is invalidated on disk if forced
X-Git-Tag: v10.0.2~121^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfbcbc72a32fc75a545f66627a5160e8d267b533;p=ceph.git

librbd: ensure object map is invalidated on disk if forced

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/object_map/InvalidateRequest.cc b/src/librbd/object_map/InvalidateRequest.cc
index 464a5dacc86..34506e41027 100644
--- a/src/librbd/object_map/InvalidateRequest.cc
+++ b/src/librbd/object_map/InvalidateRequest.cc
@@ -42,7 +42,7 @@ void InvalidateRequest::send() {
   // do not update on-disk flags if not image owner
   if (m_image_ctx.image_watcher == NULL ||
       (m_image_ctx.image_watcher->is_lock_supported(m_image_ctx.snap_lock) &&
-       !m_image_ctx.image_watcher->is_lock_owner())) {
+       !m_image_ctx.image_watcher->is_lock_owner() && !m_force)) {
     async_complete(0);
     return;
   }