Skip to content

Commit

Permalink
Fix RHEL 7.4 bio_set_op_attrs build error
Browse files Browse the repository at this point in the history
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
  • Loading branch information
tonyhutter authored and behlendorf committed Jun 27, 2017
1 parent 2d678f7 commit 5b7bb98
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion config/kernel-bio-op.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5b7bb98

Please sign in to comment.