From: xiexingguo <xie.xingguo@zte.com.cn>
Date: Fri, 26 Feb 2016 10:28:41 +0000 (+0800)
Subject: osd: fix wrong return type of find_osd_on_ip()
X-Git-Tag: v10.1.0~248^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73784f0b2c7fb9e24de1aad5b615e13feeeaf944;p=ceph.git

osd: fix wrong return type of find_osd_on_ip()

Fixes: #14872
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 9de54a9ecf7f..d82878864e2c 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1010,7 +1010,7 @@ int OSDMap::identify_osd(const uuid_d& u) const
   return -1;
 }
 
-bool OSDMap::find_osd_on_ip(const entity_addr_t& ip) const
+int OSDMap::find_osd_on_ip(const entity_addr_t& ip) const
 {
   for (int i=0; i<max_osd; i++)
     if (exists(i) && (get_addr(i).is_same_host(ip) || get_cluster_addr(i).is_same_host(ip)))
diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 6694e27b3bb9..8ed5896422ec 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -466,7 +466,7 @@ public:
   bool have_addr(const entity_addr_t& addr) const {
     return identify_osd(addr) >= 0;
   }
-  bool find_osd_on_ip(const entity_addr_t& ip) const;
+  int find_osd_on_ip(const entity_addr_t& ip) const;
   bool have_inst(int osd) const {
     return exists(osd) && is_up(osd); 
   }