Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
Brian Behlendorf 2021-11-05 17:17:03 -07:00 committed by Tony Hutter
parent b8b3b93ebb
commit 6de5c440fa
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/kernel-bio.m4
View File

@ -294,9 +294,8 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_SUBMIT_BIO], [
ZFS_LINUX_TEST_SRC([submit_bio], [ ZFS_LINUX_TEST_SRC([submit_bio], [
#include <linux/bio.h> #include <linux/bio.h>
],[ ],[
blk_qc_t blk_qc;
struct bio *bio = NULL; struct bio *bio = NULL;
blk_qc = submit_bio(bio); (void) submit_bio(bio);
]) ])
]) ])

4
module/os/linux/zfs/vdev_disk.c
View File

@ -438,9 +438,9 @@ static inline void
vdev_submit_bio_impl(struct bio *bio) vdev_submit_bio_impl(struct bio *bio)
{ {
#ifdef HAVE_1ARG_SUBMIT_BIO #ifdef HAVE_1ARG_SUBMIT_BIO
submit_bio(bio); (void) submit_bio(bio);
#else #else
submit_bio(0, bio); (void) submit_bio(0, bio);
#endif #endif
} }