c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 03:09:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make inline ABD predicates compatible with C++

Browse Source 
FreeBSD's zfsd fails to build after e2af2acce3 due to strict type
checking errors from the implicit conversion between bool and boolean_t
in the inline predicate definitions in abd.h.

Use conditionals to return the correct value type from these functions.

Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes #11592
This commit is contained in:
Ryan Moeller 2021-02-15 13:15:50 -05:00 committed by GitHub
parent c1c31a835a
commit 436ab35a53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sys/abd.h
View File

@ -177,19 +177,19 @@ abd_zero(abd_t *abd, size_t size)
static inline boolean_t static inline boolean_t
abd_is_linear(abd_t *abd) abd_is_linear(abd_t *abd)
{ {
return ((abd->abd_flags & ABD_FLAG_LINEAR) != 0); return ((abd->abd_flags & ABD_FLAG_LINEAR) ? B_TRUE : B_FALSE);
} }
static inline boolean_t static inline boolean_t
abd_is_linear_page(abd_t *abd) abd_is_linear_page(abd_t *abd)
{ {
return ((abd->abd_flags & ABD_FLAG_LINEAR_PAGE) != 0); return ((abd->abd_flags & ABD_FLAG_LINEAR_PAGE) ? B_TRUE : B_FALSE);
} }
static inline boolean_t static inline boolean_t
abd_is_gang(abd_t *abd) abd_is_gang(abd_t *abd)
{ {
return ((abd->abd_flags & ABD_FLAG_GANG) != 0); return ((abd->abd_flags & ABD_FLAG_GANG) ? B_TRUE : B_FALSE);
} }
static inline uint_t static inline uint_t