Kconfig: fix dependency issue when building in-tree without CONFIG_FTRACE

[lttng-modules.git] / src / lttng-statedump-impl.c

diff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c
index 1a2a12ba7f650ceb9a633b2cd7f79729aeadec32..153ddf8e9de83719b8471b97174ff72646e6f85c 100644 (file)
--- a/src/lttng-statedump-impl.c
+++ b/src/lttng-statedump-impl.c
@@ -72,6 +72,7 @@ DEFINE_TRACE(lttng_statedump_process_mnt_ns);
 DEFINE_TRACE(lttng_statedump_process_net_ns);
 DEFINE_TRACE(lttng_statedump_process_user_ns);
 DEFINE_TRACE(lttng_statedump_process_uts_ns);
+DEFINE_TRACE(lttng_statedump_process_time_ns);
 DEFINE_TRACE(lttng_statedump_network_interface);
 #ifdef LTTNG_HAVE_STATEDUMP_CPU_TOPOLOGY
 DEFINE_TRACE(lttng_statedump_cpu_topology);
@@ -151,10 +152,19 @@ int lttng_enumerate_block_devices(struct lttng_session *session)
 
                disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0);
                while ((part = disk_part_iter_next(&piter))) {
+                       struct block_device bdev;
                        char name_buf[BDEVNAME_SIZE];
-                       char *p;
+                       const char *p;
 
-                       p = wrapper_disk_name(disk, part->partno, name_buf);
+                       /*
+                        * Create a partial 'struct blockdevice' to use
+                        * 'bdevname()' which is a simple wrapper over
+                        * 'disk_name()' but has the honor to be EXPORT_SYMBOL.
+                        */
+                       bdev.bd_disk = disk;
+                       bdev.bd_part = part;
+
+                       p = bdevname(&bdev, name_buf);
                        if (!p) {
                                disk_part_iter_exit(&piter);
                                class_dev_iter_exit(&iter);
@@ -444,6 +454,9 @@ void lttng_statedump_process_ns(struct lttng_session *session,
 #endif
                trace_lttng_statedump_process_net_ns(session, p, proxy->net_ns);
                trace_lttng_statedump_process_uts_ns(session, p, proxy->uts_ns);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+               trace_lttng_statedump_process_time_ns(session, p, proxy->time_ns);
+#endif
        }
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) || \
                LTTNG_UBUNTU_KERNEL_RANGE(3,13,11,36, 3,14,0,0) || \