diff options
| author | Brian Behlendorf <[email protected]> | 2019-01-16 10:39:19 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-01-28 10:11:45 -0800 |
| commit | 26a856594f731db62446cf537659f9360261fe97 (patch) | |
| tree | 39f1422bdb38e32b10990e53b2ab7067956e8bc5 /config | |
| parent | 0c593296e98e3ac95f14704e4cee6cedb2134990 (diff) | |
Linux 5.0 compat: Fix bio_set_dev()
The Linux 5.0 kernel updated the bio_set_dev() macro so it calls the
GPL-only bio_associate_blkg() symbol thus inadvertently converting
the entire macro. Provide a minimal version which always assigns the
request queue's root_blkg to the bio.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #8287
Diffstat (limited to 'config')
| -rw-r--r-- | config/kernel-bio_set_dev.m4 | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/config/kernel-bio_set_dev.m4 b/config/kernel-bio_set_dev.m4 index 6be873c56..71d47a893 100644 --- a/config/kernel-bio_set_dev.m4 +++ b/config/kernel-bio_set_dev.m4 @@ -1,10 +1,10 @@ dnl # dnl # Linux 4.14 API, dnl # -dnl # The bio_set_dev() helper was introduced as part of the transition +dnl # The bio_set_dev() helper macro was introduced as part of the transition dnl # to have struct gendisk in struct bio. dnl # -AC_DEFUN([ZFS_AC_KERNEL_BIO_SET_DEV], [ +AC_DEFUN([ZFS_AC_KERNEL_BIO_SET_DEV_MACRO], [ AC_MSG_CHECKING([whether bio_set_dev() exists]) ZFS_LINUX_TRY_COMPILE([ #include <linux/bio.h> @@ -20,3 +20,34 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO_SET_DEV], [ AC_MSG_RESULT(no) ]) ]) + +dnl # +dnl # Linux 5.0 API, +dnl # +dnl # The bio_set_dev() helper macro was updated to internally depend on +dnl # bio_associate_blkg() symbol which is exported GPL-only. +dnl # +AC_DEFUN([ZFS_AC_KERNEL_BIO_SET_DEV_GPL_ONLY], [ + AC_MSG_CHECKING([whether bio_set_dev() is GPL-only]) + ZFS_LINUX_TRY_COMPILE([ + #include <linux/module.h> + #include <linux/bio.h> + #include <linux/fs.h> + MODULE_LICENSE("$ZFS_META_LICENSE"); + ],[ + struct block_device *bdev = NULL; + struct bio *bio = NULL; + bio_set_dev(bio, bdev); + ],[ + AC_MSG_RESULT(no) + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_BIO_SET_DEV_GPL_ONLY, 1, + [bio_set_dev() GPL-only]) + ]) +]) + +AC_DEFUN([ZFS_AC_KERNEL_BIO_SET_DEV], [ + ZFS_AC_KERNEL_BIO_SET_DEV_MACRO + ZFS_AC_KERNEL_BIO_SET_DEV_GPL_ONLY +]) |