From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 21 Jun 2017 20:47:54 +0000 (+0300)
Subject: OpenZFS 8416 - abd.h is not C++ friendly
X-Git-Tag: zfs-0.7.0-rc5~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1579dcbc9176d3875f3ce8926076e46a87d8e8ed;p=zfs

OpenZFS 8416 - abd.h is not C++ friendly

Authored by: Andriy Gapon <avg@FreeBSD.org>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Alek Pinchuk <pinchuk.alek@gmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Ported-by: Giuseppe Di Natale <dinatale2@llnl.gov>

OpenZFS-issue: https://www.illumos.org/issues/8416
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/589c189
Closes #6288
---

diff --git a/include/sys/abd.h b/include/sys/abd.h
index 59b679491..cd7105013 100644
--- a/include/sys/abd.h
+++ b/include/sys/abd.h
@@ -73,7 +73,7 @@ extern int zfs_abd_scatter_enabled;
 static inline boolean_t
 abd_is_linear(abd_t *abd)
 {
-	return ((abd->abd_flags & ABD_FLAG_LINEAR) != 0);
+	return ((abd->abd_flags & ABD_FLAG_LINEAR) != 0 ? B_TRUE : B_FALSE);
 }
 
 /*