Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eed50879 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Squelch kbuild sparse complaint 



New complaint from kbuild for 4.9.y:

net/sunrpc/xprtrdma/verbs.c:489:19: sparse: incompatible types in
    comparison expression (different type sizes)

verbs.c:
489	max_sge = min(ia->ri_device->attrs.max_sge, RPCRDMA_MAX_SEND_SGES);

I can't reproduce this running sparse here. Likewise, "make W=1
net/sunrpc/xprtrdma/verbs.o" never indicated any issue.

A little poking suggests that because the range of its values is
small, gcc can make the actual width of RPCRDMA_MAX_SEND_SGES
smaller than the width of an unsigned integer.

Fixes: 16f906d6 ("xprtrdma: Reduce required number of send SGEs")
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Cc: stable@kernel.org
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 38a33101

net/sunrpc/xprtrdma/verbs.c

+2 −1
Original line number Diff line number Diff line
@@ -503,7 +503,8 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 
	struct ib_cq *sendcq, *recvcq;

	int rc;



	max_sge = min(ia->ri_device->attrs.max_sge, RPCRDMA_MAX_SEND_SGES);

	max_sge = min_t(unsigned int, ia->ri_device->attrs.max_sge,

			RPCRDMA_MAX_SEND_SGES);

	if (max_sge < RPCRDMA_MIN_SEND_SGES) {

		pr_warn("rpcrdma: HCA provides only %d send SGEs\n", max_sge);

		return -ENOMEM;