diff options
| author | Tony Hutter <[email protected]> | 2017-06-27 12:00:27 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-06-27 12:00:27 -0700 |
| commit | 5b7bb98387e77259aab50a8c081e4c527a60b58e (patch) | |
| tree | 931eb5813464cc489587454f877797a9b1963d74 /config | |
| parent | 2d678f779aba26a93314c8ee1142c3985fa25cb6 (diff) | |
Fix RHEL 7.4 bio_set_op_attrs build error
On RHEL 7.4, include/linux/bio.h now includes a macro for
bio_set_op_attrs that conflicts with the ifndef in ZFS
include/linux/blkdev_compat.h. This patch fixes the build.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Signed-off-by: Tony Hutter <[email protected]>
Closes #6234
Closes #6271
Diffstat (limited to 'config')
| -rw-r--r-- | config/kernel-bio-op.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/kernel-bio-op.m4 b/config/kernel-bio-op.m4 index 5559d6c7f..8299e490c 100644 --- a/config/kernel-bio-op.m4 +++ b/config/kernel-bio-op.m4 @@ -69,7 +69,7 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO_BI_OPF], [ AC_DEFUN([ZFS_AC_KERNEL_HAVE_BIO_SET_OP_ATTRS], [ AC_MSG_CHECKING([whether bio_set_op_attrs is available]) ZFS_LINUX_TRY_COMPILE([ - #include <linux/blk_types.h> + #include <linux/bio.h> ],[ struct bio *bio __attribute__ ((unused)) = NULL; |