Linux 5.18 compat: replace genhd.h with blkdev.h includes

blkdev.h includes genhd.h since dawn of upstream git, so this is
globally safe

Upstream-commit: 322cbb50de711814c42fb088f6d31901502c711a ("block:
 remove genhd.h")

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13251

diff --git a/config/kernel-add-disk.m4 b/config/kernel-add-disk.m4
index 5d1779eb432891a7203214309a77d27ca46796ae..44a8a5fd25b605af66a40e1002ffec7ce34a1fb7 100644 (file)
--- a/config/kernel-add-disk.m4
+++ b/config/kernel-add-disk.m4
@@ -3,16 +3,15 @@ dnl # 5.16 API change
 dnl # add_disk grew a must-check return code
 dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_ADD_DISK], [
-
        ZFS_LINUX_TEST_SRC([add_disk_ret], [
-               #include <linux/genhd.h>
+               #include <linux/blkdev.h>
        ], [
                struct gendisk *disk = NULL;
                int err = add_disk(disk);
                err = err;
        ])
-
 ])
+
 AC_DEFUN([ZFS_AC_KERNEL_ADD_DISK], [
        AC_MSG_CHECKING([whether add_disk() returns int])
        ZFS_LINUX_TEST_RESULT([add_disk_ret],

diff --git a/config/kernel-revalidate-disk-size.m4 b/config/kernel-revalidate-disk-size.m4
index a7d0cb3cdab4edadc9d44d30eb9546d648d6b52c..13cb92a174e3e4f2e4f956044524fd70ee51acc3 100644 (file)
--- a/config/kernel-revalidate-disk-size.m4
+++ b/config/kernel-revalidate-disk-size.m4
@@ -8,14 +8,14 @@ dnl #
 AC_DEFUN([ZFS_AC_KERNEL_SRC_REVALIDATE_DISK], [
 
        ZFS_LINUX_TEST_SRC([revalidate_disk_size], [
-               #include <linux/genhd.h>
+               #include <linux/blkdev.h>
        ], [
                struct gendisk *disk = NULL;
                (void) revalidate_disk_size(disk, false);
        ])
 
        ZFS_LINUX_TEST_SRC([revalidate_disk], [
-               #include <linux/genhd.h>
+               #include <linux/blkdev.h>
        ], [
                struct gendisk *disk = NULL;
                (void) revalidate_disk(disk);

diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c
index f772f416043e24e8bef15ee3528495dd2254f8fc..c964cce0de9a693d39871fd54742ddfcfc25fc03 100644 (file)
--- a/module/os/linux/zfs/zvol_os.c
+++ b/module/os/linux/zfs/zvol_os.c
@@ -906,7 +906,7 @@ zvol_alloc(dev_t dev, const char *name)
        if (volmode == ZFS_VOLMODE_DEV) {
                /*
                 * ZFS_VOLMODE_DEV disable partitioning on ZVOL devices: set
-                * gendisk->minors = 1 as noted in include/linux/genhd.h.
+                * gendisk->minors = 1 as noted in include/linux/blkdev.h.
                 * Also disable extended partition numbers (GENHD_FL_EXT_DEVT)
                 * and suppresses partition scanning (GENHD_FL_NO_PART_SCAN)
                 * setting gendisk->flags accordingly.