diff options
| author | наб <[email protected]> | 2022-03-24 16:33:40 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2022-04-06 13:15:27 -0700 |
| commit | 9f7f70450791822518e6e9dc515a4ded47e74c51 (patch) | |
| tree | 3a0255595eb87c713570c1bbb42a5b7baafbe405 /config | |
| parent | 215a8255a97f32cb26881d6fb4f883b7608329d0 (diff) | |
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 <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13251
Diffstat (limited to 'config')
| -rw-r--r-- | config/kernel-add-disk.m4 | 5 | ||||
| -rw-r--r-- | config/kernel-revalidate-disk-size.m4 | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/config/kernel-add-disk.m4 b/config/kernel-add-disk.m4 index 5d1779eb4..44a8a5fd2 100644 --- 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 a7d0cb3cd..13cb92a17 100644 --- 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); |