1*4882a593SmuzhiyunFrom 82fbf9d383ff9069808fb0f5f75c660098dbae52 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Michael Jeanson <mjeanson@efficios.com> 3*4882a593SmuzhiyunDate: Tue, 5 Apr 2022 14:57:41 -0400 4*4882a593SmuzhiyunSubject: [PATCH 09/10] Rename genhd wrapper to blkdev 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe genhd.h header was folded into blkdev.h in v5.18, rename our wrapper 7*4882a593Smuzhiyunto follow upstream. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunUpstream-Status: Backport 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunChange-Id: I4ec94fb94d11712dd20f0680aea1de77fbfa9d17 12*4882a593SmuzhiyunSigned-off-by: Michael Jeanson <mjeanson@efficios.com> 13*4882a593SmuzhiyunSigned-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun include/wrapper/{genhd.h => blkdev.h} | 10 +++++----- 16*4882a593Smuzhiyun src/lttng-statedump-impl.c | 2 +- 17*4882a593Smuzhiyun 2 files changed, 6 insertions(+), 6 deletions(-) 18*4882a593Smuzhiyun rename include/wrapper/{genhd.h => blkdev.h} (93%) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff --git a/include/wrapper/genhd.h b/include/wrapper/blkdev.h 21*4882a593Smuzhiyunsimilarity index 93% 22*4882a593Smuzhiyunrename from include/wrapper/genhd.h 23*4882a593Smuzhiyunrename to include/wrapper/blkdev.h 24*4882a593Smuzhiyunindex 4a59b68e..0d5ad90f 100644 25*4882a593Smuzhiyun--- a/include/wrapper/genhd.h 26*4882a593Smuzhiyun+++ b/include/wrapper/blkdev.h 27*4882a593Smuzhiyun@@ -1,6 +1,6 @@ 28*4882a593Smuzhiyun /* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only) 29*4882a593Smuzhiyun * 30*4882a593Smuzhiyun- * wrapper/genhd.h 31*4882a593Smuzhiyun+ * wrapper/blkdev.h 32*4882a593Smuzhiyun * 33*4882a593Smuzhiyun * wrapper around block layer functions and data structures. Using 34*4882a593Smuzhiyun * KALLSYMS to get its address when available, else we need to have a 35*4882a593Smuzhiyun@@ -9,8 +9,8 @@ 36*4882a593Smuzhiyun * Copyright (C) 2011-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com> 37*4882a593Smuzhiyun */ 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun-#ifndef _LTTNG_WRAPPER_GENHD_H 40*4882a593Smuzhiyun-#define _LTTNG_WRAPPER_GENHD_H 41*4882a593Smuzhiyun+#ifndef _LTTNG_WRAPPER_BLKDEV_H 42*4882a593Smuzhiyun+#define _LTTNG_WRAPPER_BLKDEV_H 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) 45*4882a593Smuzhiyun #include <linux/blkdev.h> 46*4882a593Smuzhiyun@@ -45,7 +45,7 @@ struct class *wrapper_get_block_class(void) 47*4882a593Smuzhiyun /* 48*4882a593Smuzhiyun * Canary function to check for 'block_class' at compile time. 49*4882a593Smuzhiyun * 50*4882a593Smuzhiyun- * From 'include/linux/genhd.h': 51*4882a593Smuzhiyun+ * From 'include/linux/blkdev.h': 52*4882a593Smuzhiyun * 53*4882a593Smuzhiyun * extern struct class block_class; 54*4882a593Smuzhiyun */ 55*4882a593Smuzhiyun@@ -104,4 +104,4 @@ struct device_type *wrapper_get_disk_type(void) 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun #endif 58*4882a593Smuzhiyun 59*4882a593Smuzhiyun-#endif /* _LTTNG_WRAPPER_GENHD_H */ 60*4882a593Smuzhiyun+#endif /* _LTTNG_WRAPPER_BLKDEV_H */ 61*4882a593Smuzhiyundiff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c 62*4882a593Smuzhiyunindex 4d7b2921..0e753090 100644 63*4882a593Smuzhiyun--- a/src/lttng-statedump-impl.c 64*4882a593Smuzhiyun+++ b/src/lttng-statedump-impl.c 65*4882a593Smuzhiyun@@ -41,7 +41,7 @@ 66*4882a593Smuzhiyun #include <wrapper/namespace.h> 67*4882a593Smuzhiyun #include <wrapper/irq.h> 68*4882a593Smuzhiyun #include <wrapper/tracepoint.h> 69*4882a593Smuzhiyun-#include <wrapper/genhd.h> 70*4882a593Smuzhiyun+#include <wrapper/blkdev.h> 71*4882a593Smuzhiyun #include <wrapper/file.h> 72*4882a593Smuzhiyun #include <wrapper/fdtable.h> 73*4882a593Smuzhiyun #include <wrapper/sched.h> 74*4882a593Smuzhiyun-- 75*4882a593Smuzhiyun2.19.1 76*4882a593Smuzhiyun 77