diff options
| author | Brian Behlendorf <behlendorf1@llnl.gov> | 2021-11-05 17:17:03 -0700 |
|---|---|---|
| committer | Tony Hutter <hutter2@llnl.gov> | 2021-11-12 16:31:55 -0800 |
| commit | 6de5c440fad3c22d12e5426bfa9c4d260390b762 (patch) | |
| tree | 69ceb001cf697d5710b39ad98aee738efba27afa | |
| parent | b8b3b93ebbc96f99935b3cb7ad3d1eab36d08fa1 (diff) | |
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 <hutter2@llnl.gov>
Reviewed-by: Alexander Lobakin <alobakin@pm.me>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #12725
| -rw-r--r-- | config/kernel-bio.m4 | 3 | ||||
| -rw-r--r-- | 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 d8692bd39..aad4d31cf 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 <linux/bio.h> ],[ - 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 aaaf41059..e9a470f53 100644 --- a/module/os/linux/zfs/vdev_disk.c +++ b/module/os/linux/zfs/vdev_disk.c @@ -438,9 +438,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 } |