1 From 82fbf9d383ff9069808fb0f5f75c660098dbae52 Mon Sep 17 00:00:00 2001
2 From: Michael Jeanson <mjeanson@efficios.com>
3 Date: Tue, 5 Apr 2022 14:57:41 -0400
4 Subject: [PATCH 09/13] Rename genhd wrapper to blkdev
6 The genhd.h header was folded into blkdev.h in v5.18, rename our wrapper
9 Change-Id: I4ec94fb94d11712dd20f0680aea1de77fbfa9d17
10 Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
11 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
13 include/wrapper/{genhd.h => blkdev.h} | 10 +++++-----
14 src/lttng-statedump-impl.c | 2 +-
15 2 files changed, 6 insertions(+), 6 deletions(-)
16 rename include/wrapper/{genhd.h => blkdev.h} (93%)
18 diff --git a/include/wrapper/genhd.h b/include/wrapper/blkdev.h
20 rename from include/wrapper/genhd.h
21 rename to include/wrapper/blkdev.h
22 index 4a59b68e..0d5ad90f 100644
23 --- a/include/wrapper/genhd.h
24 +++ b/include/wrapper/blkdev.h
26 /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
31 * wrapper around block layer functions and data structures. Using
32 * KALLSYMS to get its address when available, else we need to have a
34 * Copyright (C) 2011-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
37 -#ifndef _LTTNG_WRAPPER_GENHD_H
38 -#define _LTTNG_WRAPPER_GENHD_H
39 +#ifndef _LTTNG_WRAPPER_BLKDEV_H
40 +#define _LTTNG_WRAPPER_BLKDEV_H
42 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
43 #include <linux/blkdev.h>
44 @@ -45,7 +45,7 @@ struct class *wrapper_get_block_class(void)
46 * Canary function to check for 'block_class' at compile time.
48 - * From 'include/linux/genhd.h':
49 + * From 'include/linux/blkdev.h':
51 * extern struct class block_class;
53 @@ -104,4 +104,4 @@ struct device_type *wrapper_get_disk_type(void)
57 -#endif /* _LTTNG_WRAPPER_GENHD_H */
58 +#endif /* _LTTNG_WRAPPER_BLKDEV_H */
59 diff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c
60 index 4d7b2921..0e753090 100644
61 --- a/src/lttng-statedump-impl.c
62 +++ b/src/lttng-statedump-impl.c
64 #include <wrapper/namespace.h>
65 #include <wrapper/irq.h>
66 #include <wrapper/tracepoint.h>
67 -#include <wrapper/genhd.h>
68 +#include <wrapper/blkdev.h>
69 #include <wrapper/file.h>
70 #include <wrapper/fdtable.h>
71 #include <wrapper/sched.h>