X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=wrapper%2Fgenhd.h;h=cacf3275ca628acfa6f2bf5945c683e94a58b1ff;hb=refs%2Fheads%2Fstable-2.12;hp=6bae239d19593e42f75a3ad0dfc9ddc88e6154f9;hpb=d89339591ec12a2686eb98ba7cdf16fb883a7863;p=lttng-modules.git

diff --git a/wrapper/genhd.h b/wrapper/genhd.h
index 6bae239d..cacf3275 100644
--- a/wrapper/genhd.h
+++ b/wrapper/genhd.h
@@ -12,13 +12,18 @@
 #ifndef _LTTNG_WRAPPER_GENHD_H
 #define _LTTNG_WRAPPER_GENHD_H
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) \
+	|| LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0))
+#include <linux/blkdev.h>
+#else
 #include <linux/genhd.h>
-#include <lttng/kernel-version.h>
+#endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
-#define LTTNG_DISK_PART_TYPE struct block_device
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0) \
+	|| LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0))
+#define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN
 #else
-#define LTTNG_DISK_PART_TYPE struct hd_struct
+#define LTTNG_GENHD_FL_HIDDEN GENHD_FL_SUPPRESS_PARTITION_INFO
 #endif
 
 #ifdef CONFIG_KALLSYMS_ALL
@@ -101,59 +106,4 @@ struct device_type *wrapper_get_disk_type(void)
 
 #endif
 
-/*
- * This wrapper has an 'int' return type instead of the original 'void', to be
- * able to report the symbol lookup failure to the caller.
- *
- * Return 0 on success, -1 on error.
- */
-int wrapper_disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk,
-                          unsigned int flags);
-LTTNG_DISK_PART_TYPE *wrapper_disk_part_iter_next(struct disk_part_iter *piter);
-void wrapper_disk_part_iter_exit(struct disk_part_iter *piter);
-
-/*
- * Canary function to check for 'disk_part_iter_init()' at compile time.
- *
- * From 'include/linux/genhd.h':
- *
- *   extern void disk_part_iter_init(struct disk_part_iter *piter,
- *                                   struct gendisk *disk, unsigned int flags);
- *
- */
-static inline
-void __canary__disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk,
-		unsigned int flags)
-{
-	disk_part_iter_init(piter, disk, flags);
-}
-
-/*
- * Canary function to check for 'disk_part_iter_next()' at compile time.
- *
- * From 'include/linux/genhd.h':
- *
- *   struct block_device *disk_part_iter_next(struct disk_part_iter *piter);
- *
- */
-static inline
-LTTNG_DISK_PART_TYPE *__canary__disk_part_iter_next(struct disk_part_iter *piter)
-{
-	return disk_part_iter_next(piter);
-}
-
-/*
- * Canary function to check for 'disk_part_iter_exit()' at compile time.
- *
- * From 'include/linux/genhd.h':
- *
- *   extern void disk_part_iter_exit(struct disk_part_iter *piter);
- *
- */
-static inline
-void __canary__disk_part_iter_exit(struct disk_part_iter *piter)
-{
-	return disk_part_iter_exit(piter);
-}
-
 #endif /* _LTTNG_WRAPPER_GENHD_H */