X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fwrapper%2Fgenhd.h;h=c28a52e343dfe730d1a98ecc2395080c04cb1910;hb=7633c7736aefbf2ac3c308021d7aa2bb3229ae94;hp=689803881dbb0f9a950c651d48aa4b9a11e83564;hpb=2836dd4ff6274876a8709fcc1637e78bbc059cdf;p=lttng-modules.git

diff --git a/include/wrapper/genhd.h b/include/wrapper/genhd.h
index 68980388..c28a52e3 100644
--- a/include/wrapper/genhd.h
+++ b/include/wrapper/genhd.h
@@ -13,6 +13,13 @@
 #define _LTTNG_WRAPPER_GENHD_H
 
 #include <linux/genhd.h>
+#include <lttng/kernel-version.h>
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0))
+#define LTTNG_DISK_PART_TYPE struct block_device
+#else
+#define LTTNG_DISK_PART_TYPE struct hd_struct
+#endif
 
 #ifdef CONFIG_KALLSYMS_ALL
 
@@ -94,4 +101,59 @@ 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 */