From: Sage Weil <sage@redhat.com>
Date: Fri, 11 Mar 2016 18:29:54 +0000 (-0500)
Subject: osd/PGLog: fix warning
X-Git-Tag: v10.1.0~98^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9dbf545f9e6d2593a0b2f986bdb6220688e1a4d;p=ceph.git

osd/PGLog: fix warning

osd/PGLog.h: In member function 'virtual unsigned int PGLog::get_subsys() const':
osd/PGLog.h:39:28: warning: enumeral and non-enumeral type in conditional expression [-Wextra]
     return prefix_provider ? prefix_provider->get_subsys() : ceph_subsys_osd;
                            ^


Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 7740b3aaa90e..0083303bb727 100644
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -36,7 +36,8 @@ struct PGLog : DoutPrefixProvider {
     return prefix_provider ? prefix_provider->gen_prefix() : "";
   }
   unsigned get_subsys() const {
-    return prefix_provider ? prefix_provider->get_subsys() : ceph_subsys_osd;
+    return prefix_provider ? prefix_provider->get_subsys() :
+      (unsigned)ceph_subsys_osd;
   }
   CephContext *get_cct() const {
     return cct;