From 333836aa78ba36c910d46529fa2dc3b980b1798f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 4 Jan 2019 13:00:11 -0600 Subject: [PATCH] librbd: stringify locker name with get_legacy_str() This avoids the new v1: v2: prefixes. Signed-off-by: Sage Weil --- src/librbd/internal.cc | 4 ++-- src/librbd/managed_lock/GetLockerRequest.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index b0df2f77d66..ccb38aed5e4 100644 --- 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 157c2dc6777..fb5bb322731 100644 --- a/src/librbd/managed_lock/GetLockerRequest.cc +++ b/src/librbd/managed_lock/GetLockerRequest.cc @@ -105,7 +105,7 @@ void GetLockerRequest::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); -- 2.39.5