From: Ricardo Dias <rdias@suse.com>
Date: Fri, 18 Mar 2016 10:36:46 +0000 (+0000)
Subject: rbd: rbd-mirroring: Fixed if clause in mirror_image_get_info
X-Git-Tag: v10.1.0~19^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ebb4f36b21362f3f31c0bf83d3690db1621e56f;p=ceph.git

rbd: rbd-mirroring: Fixed if clause in mirror_image_get_info

This fix targets the case when journaling is not enabled but
someone calls mirror_image_get_info.

Signed-off-by: Ricardo Dias <rdias@suse.com>
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index bfed621e748..73ebb0a24c1 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -2718,11 +2718,15 @@ int validate_mirroring_enabled(ImageCtx *ictx) {
         static_cast<rbd_mirror_image_state_t>(mirror_image_internal.state);
     }
 
-    r = Journal<>::is_tag_owner(ictx, &mirror_image_info->primary);
-    if (r < 0) {
-      lderr(cct) << "failed to check tag ownership: "
-                 << cpp_strerror(r) << dendl;
-      return r;
+    if (mirror_image_info->state == RBD_MIRROR_IMAGE_ENABLED) {
+      r = Journal<>::is_tag_owner(ictx, &mirror_image_info->primary);
+      if (r < 0) {
+        lderr(cct) << "failed to check tag ownership: "
+                   << cpp_strerror(r) << dendl;
+        return r;
+      }
+    } else {
+      mirror_image_info->primary = false;
     }
 
     return 0;