librbd: stringify locker name with get_legacy_str()

This avoids the new v1: v2: prefixes.

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

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index b0df2f77d66c41224c7d61d5bf3502635cd7ef06..ccb38aed5e4c96bbe9471d24021b804538619aa4 100644 (file)
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1592,7 +1592,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
        locker_t locker;
        locker.client = stringify(it->first.locker);
        locker.cookie = it->first.cookie;
-       locker.address = stringify(it->second.addr);
+       locker.address = it->second.addr.get_legacy_str();
        lockers->push_back(locker);
       }
     }
@@ -1688,7 +1688,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
       for (Lockers::iterator it = lockers.begin();
            it != lockers.end(); ++it) {
         if (it->first.locker == lock_client) {
-          client_address = stringify(it->second.addr);
+          client_address = it->second.addr.get_legacy_str();
           break;
         }
       }

diff --git a/src/librbd/managed_lock/GetLockerRequest.cc b/src/librbd/managed_lock/GetLockerRequest.cc
index 157c2dc6777fe9b5f1399e7af80da47570f5f627..fb5bb32273120e0fd28b3f18aed6583ece58f355 100644 (file)
--- a/src/librbd/managed_lock/GetLockerRequest.cc
+++ b/src/librbd/managed_lock/GetLockerRequest.cc
@@ -105,7 +105,7 @@ void GetLockerRequest<I>::handle_get_lockers(int r) {
 
   m_locker->entity = iter->first.locker;
   m_locker->cookie = iter->first.cookie;
-  m_locker->address = stringify(iter->second.addr);
+  m_locker->address = iter->second.addr.get_legacy_str();
   if (m_locker->cookie.empty() || m_locker->address.empty()) {
     ldout(m_cct, 20) << "no valid lockers detected" << dendl;
     finish(-ENOENT);