From: Sage Weil <sage@redhat.com>
Date: Wed, 30 May 2018 20:12:28 +0000 (-0500)
Subject: client: use get_addrs()
X-Git-Tag: v14.0.1~1208^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ced1e33f2c33c6027146a2506385a21aa68a013;p=ceph.git

client: use get_addrs()

These are legacy interfaces that should return an IP only.

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

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 0e92b886c21..57fce6c2d84 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -12431,7 +12431,7 @@ int Client::ll_osdaddr(int osd, uint32_t *addr)
   bool exists = objecter->with_osdmap([&](const OSDMap& o) {
       if (!o.exists(osd))
 	return false;
-      g = o.get_addr(osd);
+      g = o.get_addrs(osd).front();
       return true;
     });
   if (!exists)
@@ -13449,7 +13449,7 @@ int Client::get_file_stripe_address(int fd, loff_t offset,
       if (osds.empty())
 	return -EINVAL;
       for (unsigned i = 0; i < osds.size(); i++) {
-	entity_addr_t addr = o.get_addr(osds[i]);
+	entity_addr_t addr = o.get_addrs(osds[i]).front();
 	address.push_back(addr);
       }
       return 0;
@@ -13467,7 +13467,7 @@ int Client::get_osd_addr(int osd, entity_addr_t& addr)
       if (!o.exists(osd))
 	return -ENOENT;
 
-      addr = o.get_addr(osd);
+      addr = o.get_addrs(osd).front();
       return 0;
     });
 }