From: Ilya Dryomov <idryomov@gmail.com>
Date: Fri, 24 May 2024 10:19:14 +0000 (+0200)
Subject: tracing: rename parent/child_id fields on librbd clone tracepoints
X-Git-Tag: v19.1.1~206^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23cb3ad7afdcdcc5da0a68865e4d88975d70cddb;p=ceph.git

tracing: rename parent/child_id fields on librbd clone tracepoints

Make it clear that these are pool IDs, referring to the same pool(s) as
parent/child_pool_name fields.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 4467065c3544d7796ed1256a14b96be857038144)
---

diff --git a/src/tracing/librbd.tp b/src/tracing/librbd.tp
index 5b7f2b31ff3..791171e27f5 100644
--- a/src/tracing/librbd.tp
+++ b/src/tracing/librbd.tp
@@ -1386,20 +1386,20 @@ TRACEPOINT_EVENT(librbd, aio_compare_and_write_exit,
 TRACEPOINT_EVENT(librbd, clone_enter,
     TP_ARGS(
         const char*, parent_pool_name,
-        uint64_t, parent_id,
+        uint64_t, parent_pool_id,
         const char*, parent_name,
         const char*, parent_snap_name,
         const char*, child_pool_name,
-        uint64_t, child_id,
+        uint64_t, child_pool_id,
         const char*, child_name,
         uint64_t, features),
     TP_FIELDS(
         ctf_string(parent_pool_name, parent_pool_name)
-        ctf_integer(uint64_t, parent_id, parent_id)
+        ctf_integer(uint64_t, parent_pool_id, parent_pool_id)
         ctf_string(parent_name, parent_name)
         ctf_string(parent_snap_name, parent_snap_name)
         ctf_string(child_pool_name, child_pool_name)
-        ctf_integer(uint64_t, child_id, child_id)
+        ctf_integer(uint64_t, child_pool_id, child_pool_id)
         ctf_string(child_name, child_name)
         ctf_integer(uint64_t, features, features)
     )
@@ -1418,22 +1418,22 @@ TRACEPOINT_EVENT(librbd, clone_exit,
 TRACEPOINT_EVENT(librbd, clone2_enter,
     TP_ARGS(
         const char*, parent_pool_name,
-        uint64_t, parent_id,
+        uint64_t, parent_pool_id,
         const char*, parent_name,
         const char*, parent_snap_name,
         const char*, child_pool_name,
-        uint64_t, child_id,
+        uint64_t, child_pool_id,
         const char*, child_name,
         uint64_t, features,
         uint64_t, stripe_unit,
         int, stripe_count),
     TP_FIELDS(
         ctf_string(parent_pool_name, parent_pool_name)
-        ctf_integer(uint64_t, parent_id, parent_id)
+        ctf_integer(uint64_t, parent_pool_id, parent_pool_id)
         ctf_string(parent_name, parent_name)
         ctf_string(parent_snap_name, parent_snap_name)
         ctf_string(child_pool_name, child_pool_name)
-        ctf_integer(uint64_t, child_id, child_id)
+        ctf_integer(uint64_t, child_pool_id, child_pool_id)
         ctf_string(child_name, child_name)
         ctf_integer(uint64_t, features, features)
         ctf_integer(uint64_t, stripe_unit, stripe_unit)
@@ -1454,20 +1454,20 @@ TRACEPOINT_EVENT(librbd, clone2_exit,
 TRACEPOINT_EVENT(librbd, clone3_enter,
     TP_ARGS(
         const char*, parent_pool_name,
-        uint64_t, parent_id,
+        uint64_t, parent_pool_id,
         const char*, parent_name,
         const char*, parent_snap_name,
         const char*, child_pool_name,
-        uint64_t, child_id,
+        uint64_t, child_pool_id,
         const char*, child_name,
 	void*, opts),
     TP_FIELDS(
         ctf_string(parent_pool_name, parent_pool_name)
-        ctf_integer(uint64_t, parent_id, parent_id)
+        ctf_integer(uint64_t, parent_pool_id, parent_pool_id)
         ctf_string(parent_name, parent_name)
         ctf_string(parent_snap_name, parent_snap_name)
         ctf_string(child_pool_name, child_pool_name)
-        ctf_integer(uint64_t, child_id, child_id)
+        ctf_integer(uint64_t, child_pool_id, child_pool_id)
         ctf_string(child_name, child_name)
 	ctf_integer_hex(void*, opts, opts)
     )