git: 65d3d8496536 - stable/13 - ofed: quiet gcc -Wint-in-bool-context

[Ryan Libby]

The branch stable/13 has been updated by rlibby:

URL: https://cgit.FreeBSD.org/src/commit/?id=65d3d849653629885bd1e5de13c99f22ca03b68e

commit 65d3d849653629885bd1e5de13c99f22ca03b68e
Author:     Ryan Libby <rlibby at FreeBSD.org>
AuthorDate: 2021-02-24 23:56:16 +0000
Commit:     Ryan Libby <rlibby at FreeBSD.org>
CommitDate: 2021-07-02 21:12:18 +0000

    ofed: quiet gcc -Wint-in-bool-context
    
    The int in the argument to the ternary triggered -Wint-in-bool-context
    from gcc.  Upstream linux has a larger and more entangled patch,
    12f727721eee61b3d19dedb95cb893b2baa9fe41, which doesn't apply cleanly.
    When we eventually sync that, we can just drop this change.
    
    Reviewed by:    hselasky, imp, kib
    MFC after:      3 days
    Sponsored by:   Dell EMC Isilon
    Differential Revision:  https://reviews.freebsd.org/D28762
    
    (cherry picked from commit bf667f282a7b98e7456d11e1cb46d9707ab8e774)
---
 sys/ofed/drivers/infiniband/core/uverbs.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/ofed/drivers/infiniband/core/uverbs.h b/sys/ofed/drivers/infiniband/core/uverbs.h
index 6c8d9632b0dc..0db0d47cc691 100644
--- a/sys/ofed/drivers/infiniband/core/uverbs.h
+++ b/sys/ofed/drivers/infiniband/core/uverbs.h
@@ -64,8 +64,10 @@
 
 #define INIT_UDATA_BUF_OR_NULL(udata, ibuf, obuf, ilen, olen)			\
 	do {									\
-		(udata)->inbuf  = (ilen) ? (const void __user *) (ibuf) : NULL;	\
-		(udata)->outbuf = (olen) ? (void __user *) (obuf) : NULL;	\
+		(udata)->inbuf  = ((ilen) != 0) ?				\
+		    (const void __user *) (ibuf) : NULL;			\
+		(udata)->outbuf = ((olen) != 0) ?				\
+		    (void __user *) (obuf) : NULL;				\
 		(udata)->inlen  = (ilen);					\
 		(udata)->outlen = (olen);					\
 	} while (0)