From: Jos Collin <jcollin@redhat.com>
Date: Wed, 2 Aug 2017 06:53:28 +0000 (+0530)
Subject: osd: silence warning from -Wint-in-bool-context
X-Git-Tag: v12.1.3~91^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=874b53e09703e9ca58df059f3705f999ee7ca3d4;p=ceph.git

osd: silence warning from -Wint-in-bool-context

The following warning appears during build:
ceph/src/osd/PGLog.h: In member function ‘void PGLog::IndexedLog::index(pg_log_dup_t&)’:
ceph/src/osd/PGLog.h:29:43: warning: ‘<<’ in boolean context, did you mean ‘<’ ? [-Wint-in-bool-context]
 #define PGLOG_INDEXED_DUPS             (1 << 3)
                                        ~~~^~~~~
ceph/src/osd/PGLog.h:29:43: note: in definition of macro ‘PGLOG_INDEXED_DUPS’
 #define PGLOG_INDEXED_DUPS             (1 << 3)
                                           ^~
ceph/src/osd/PGLog.h: In member function ‘void PGLog::IndexedLog::unindex(const pg_log_dup_t&)’:
ceph/src/osd/PGLog.h:29:43: warning: ‘<<’ in boolean context, did you mean ‘<’ ? [-Wint-in-bool-context]
 #define PGLOG_INDEXED_DUPS             (1 << 3)
                                        ~~~^~~~~
ceph/src/osd/PGLog.h:29:43: note: in definition of macro ‘PGLOG_INDEXED_DUPS’
 #define PGLOG_INDEXED_DUPS             (1 << 3)
                                           ^~
Signed-off-by: Jos Collin <jcollin@redhat.com>
---

diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 19405de25be6..1c1d4e834c55 100644
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -476,13 +476,13 @@ public:
     }
 
     void index(pg_log_dup_t& e) {
-      if (PGLOG_INDEXED_DUPS) {
+      if (indexed_data & PGLOG_INDEXED_DUPS) {
 	dup_index[e.reqid] = &e;
       }
     }
 
     void unindex(const pg_log_dup_t& e) {
-      if (PGLOG_INDEXED_DUPS) {
+      if (indexed_data & PGLOG_INDEXED_DUPS) {
 	auto i = dup_index.find(e.reqid);
 	if (i != dup_index.end()) {
 	  dup_index.erase(i);