From 22b0891dbb6af5663201a035ab759d1f51fef3cd Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Nov 2021 17:17:03 -0700 Subject: [PATCH] Linux 5.16 compat: submit_bio() The submit_bio() prototype has changed again. The version is 5.16 still only expects a single argument but the return type has changed to void. Since we never used the returned value before update the configure check to detect both single arg versions. Reviewed-by: Tony Hutter Reviewed-by: Alexander Lobakin Signed-off-by: Brian Behlendorf Closes #12725 --- config/kernel-bio.m4 | 3 +-- module/os/linux/zfs/vdev_disk.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/kernel-bio.m4 b/config/kernel-bio.m4 index d8692bd399..aad4d31cf2 100644 --- a/config/kernel-bio.m4 +++ b/config/kernel-bio.m4 @@ -294,9 +294,8 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_SUBMIT_BIO], [ ZFS_LINUX_TEST_SRC([submit_bio], [ #include ],[ - blk_qc_t blk_qc; struct bio *bio = NULL; - blk_qc = submit_bio(bio); + (void) submit_bio(bio); ]) ]) diff --git a/module/os/linux/zfs/vdev_disk.c b/module/os/linux/zfs/vdev_disk.c index c56fd3a6ff..fe9752a67c 100644 --- a/module/os/linux/zfs/vdev_disk.c +++ b/module/os/linux/zfs/vdev_disk.c @@ -433,9 +433,9 @@ static inline void vdev_submit_bio_impl(struct bio *bio) { #ifdef HAVE_1ARG_SUBMIT_BIO - submit_bio(bio); + (void) submit_bio(bio); #else - submit_bio(0, bio); + (void) submit_bio(0, bio); #endif }