From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 4 Apr 2022 17:54:59 +0000 (-0400)
Subject: fix: block: remove genhd.h (v5.18)
X-Git-Tag: v2.12.14~6
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=136b513d50e037048290049f0f49b23bebfcc986;p=lttng-modules.git

fix: block: remove genhd.h (v5.18)

See upstream commit :

  commit 322cbb50de711814c42fb088f6d31901502c711a
  Author: Christoph Hellwig <hch@lst.de>
  Date:   Mon Jan 24 10:39:13 2022 +0100

    block: remove genhd.h

    There is no good reason to keep genhd.h separate from the main blkdev.h
    header that includes it.  So fold the contents of genhd.h into blkdev.h
    and remove genhd.h entirely.

Change-Id: I7cf2aaa3a4c133320b95f2edde49f790f9515dbd
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/wrapper/genhd.h b/wrapper/genhd.h
index 7559faae..f212bda3 100644
--- a/wrapper/genhd.h
+++ b/wrapper/genhd.h
@@ -12,7 +12,11 @@
 #ifndef _LTTNG_WRAPPER_GENHD_H
 #define _LTTNG_WRAPPER_GENHD_H
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0))
+#include <linux/blkdev.h>
+#else
 #include <linux/genhd.h>
+#endif
 
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))
 #define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN