Fix RHEL 7.4 bio_set_op_attrs build error #6271
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
behlendorf
requested changes
Jun 26, 2017
config/kernel-bio-op.m4
Outdated
| @@ -69,6 +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/bio.h> | |||
| #include <linux/blk_types.h> | |||
There was a problem hiding this comment.
Since linux/bio.h includes linux/blk_types.h it looks like you can remove this second include as a simplification.
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. Signed-off-by: Tony Hutter <[email protected]>
|
@behlendorf fixed in latest push |
behlendorf
approved these changes
Jun 26, 2017
dinatale2
approved these changes
Jun 27, 2017
gmelikov
approved these changes
Jun 27, 2017
tonyhutter
added a commit
to tonyhutter/zfs
that referenced
this pull request
Jun 29, 2017
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 openzfs#6234 Closes openzfs#6271
tonyhutter
added a commit
that referenced
this pull request
Jul 20, 2017
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
On RHEL 7.4,
include/linux/bio.hnow includes a macro forbio_set_op_attrsthat conflicts with the ifndef in ZFS'sinclude/linux/blkdev_compat.h. This patch fixes the build.Signed-off-by: Tony Hutter [email protected]
Motivation and Context
Fix build error (#6234)
How Has This Been Tested?
Fixes build on RHEL server 7.4 beta. Test loaded module.
Types of changes
Checklist:
Signed-off-by.