From 5b7bb98387e77259aab50a8c081e4c527a60b58e Mon Sep 17 00:00:00 2001 From: Tony Hutter Date: Tue, 27 Jun 2017 12:00:27 -0700 Subject: 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 Reviewed-by: George Melikov Reviewed-by: Giuseppe Di Natale Signed-off-by: Tony Hutter Closes #6234 Closes #6271 --- config/kernel-bio-op.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') 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 + #include ],[ struct bio *bio __attribute__ ((unused)) = NULL; -- cgit v1.2.3