From: Adam Wolfe Gordon <awg@digitalocean.com>
Date: Tue, 28 Nov 2017 16:13:01 +0000 (+0000)
Subject: librbd: Use util functions to generate header names in list_watchers
X-Git-Tag: v13.0.2~846^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b34f4ef5e50d85cb96a1706b1289175ae5dd6edd;p=ceph.git

librbd: Use util functions to generate header names in list_watchers

Signed-off-by: Adam Wolfe Gordon <awg@digitalocean.com>
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 3688c579fb66..8f885048d6d3 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -2364,9 +2364,9 @@ bool compare_by_name(const child_info_t& c1, const child_info_t& c2)
     std::list<obj_watch_t> obj_watchers;
 
     if (ictx->old_format) {
-      header_oid = ictx->name + RBD_SUFFIX;
+      header_oid = util::old_header_name(ictx->name);
     } else {
-      header_oid = RBD_HEADER_PREFIX + ictx->id;
+      header_oid = util::header_name(ictx->id);
     }
 
     r = ictx->md_ctx.list_watchers(header_oid, &obj_watchers);