From: Kefu Chai <kchai@redhat.com>
Date: Mon, 4 May 2015 06:45:11 +0000 (+0800)
Subject: osd: silence gcc -Wparentheses warning
X-Git-Tag: v9.0.1~23^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9209a8f2cf3a7ae83dfdf1a6c8c99a8e301aa079;p=ceph.git

osd: silence gcc -Wparentheses warning

otherwise we have following warning:
warning: suggest parentheses around operand of ‘!’ or change ‘|’ to
‘||’ or ‘!’ to ‘~’ [-Wparentheses]

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 79078fe69dc5..ade19f0f24c9 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2401,8 +2401,7 @@ void OSD::write_superblock(ObjectStore::Transaction& t)
   dout(10) << "write_superblock " << superblock << dendl;
 
   //hack: at minimum it's using the baseline feature set
-  if (!superblock.compat_features.incompat.mask |
-      CEPH_OSD_FEATURE_INCOMPAT_BASE.id)
+  if (!superblock.compat_features.incompat.contains(CEPH_OSD_FEATURE_INCOMPAT_BASE))
     superblock.compat_features.incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_BASE);
 
   bufferlist bl;