From: Adam C. Emerson <aemerson@redhat.com>
Date: Tue, 8 Nov 2016 15:57:14 +0000 (-0500)
Subject: mon: Fix bug in feature testing
X-Git-Tag: v11.1.0~241^2~14
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6e0685aefd049582ed29087c099e19aefbc1f693;p=ceph-ci.git

mon: Fix bug in feature testing

Since we're comparing against a bitmask, the boolean rather than bitwise
operator can't be right.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index e0b8be5de14..c511a2f80c2 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -1533,7 +1533,7 @@ class FlagSetHandler : public FileSystemCommandHandler
         return r;
       }
 
-      bool jewel = mon->get_quorum_con_features() && CEPH_FEATURE_SERVER_JEWEL;
+      bool jewel = mon->get_quorum_con_features() & CEPH_FEATURE_SERVER_JEWEL;
       if (flag_bool && !jewel) {
         ss << "Multiple-filesystems are forbidden until all mons are updated";
         return -EINVAL;