| Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 1 | From 868e0b6db59159197c2cec3550fa4ad5e6572bc5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michael Jeanson <mjeanson@efficios.com> |
| 3 | Date: Mon, 4 Apr 2022 13:54:59 -0400 |
| 4 | Subject: [PATCH 04/10] fix: block: remove genhd.h (v5.18) |
| 5 | |
| 6 | See upstream commit : |
| 7 | |
| 8 | commit 322cbb50de711814c42fb088f6d31901502c711a |
| 9 | Author: Christoph Hellwig <hch@lst.de> |
| 10 | Date: Mon Jan 24 10:39:13 2022 +0100 |
| 11 | |
| 12 | block: remove genhd.h |
| 13 | |
| 14 | There is no good reason to keep genhd.h separate from the main blkdev.h |
| 15 | header that includes it. So fold the contents of genhd.h into blkdev.h |
| 16 | and remove genhd.h entirely. |
| 17 | |
| 18 | Upstream-Status: Backport |
| 19 | |
| 20 | Change-Id: I7cf2aaa3a4c133320b95f2edde49f790f9515dbd |
| 21 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> |
| 22 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> |
| 23 | --- |
| 24 | include/wrapper/genhd.h | 4 ++++ |
| 25 | 1 file changed, 4 insertions(+) |
| 26 | |
| 27 | diff --git a/include/wrapper/genhd.h b/include/wrapper/genhd.h |
| 28 | index 3c6dbcbe..4a59b68e 100644 |
| 29 | --- a/include/wrapper/genhd.h |
| 30 | +++ b/include/wrapper/genhd.h |
| 31 | @@ -12,7 +12,11 @@ |
| 32 | #ifndef _LTTNG_WRAPPER_GENHD_H |
| 33 | #define _LTTNG_WRAPPER_GENHD_H |
| 34 | |
| 35 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) |
| 36 | +#include <linux/blkdev.h> |
| 37 | +#else |
| 38 | #include <linux/genhd.h> |
| 39 | +#endif |
| 40 | |
| 41 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) |
| 42 | #define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN |
| 43 | -- |
| 44 | 2.19.1 |
| 45 | |