Commit c8b53d0c authored by Alex Estrin's avatar Alex Estrin Committed by Jason Gunthorpe
Browse files

IB/sa: simplify return code logic for ib_nl_send_msg() 



rdma_nl_multicast() returns either negative error code
or zero if succeeded. Remove unnecessary ret code checks
and reassignments.

Reviewed-by: default avatarKaike Wan <kaike.wan@intel.com>
Signed-off-by: default avatarAlex Estrin <alex.estrin@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent e04951eb

drivers/infiniband/core/sa_query.c

+2 −11
Original line number Diff line number Diff line
@@ -835,7 +835,6 @@ static int ib_nl_send_msg(struct ib_sa_query *query, gfp_t gfp_mask) 
	struct sk_buff *skb = NULL;

	struct nlmsghdr *nlh;

	void *data;

	int ret = 0;

	struct ib_sa_mad *mad;

	int len;
@@ -862,13 +861,7 @@ static int ib_nl_send_msg(struct ib_sa_query *query, gfp_t gfp_mask) 
	/* Repair the nlmsg header length */

	nlmsg_end(skb, nlh);



	ret = rdma_nl_multicast(skb, RDMA_NL_GROUP_LS, gfp_mask);

	if (!ret)

		ret = len;

	else

		ret = 0;



	return ret;

	return rdma_nl_multicast(skb, RDMA_NL_GROUP_LS, gfp_mask);

}



static int ib_nl_make_request(struct ib_sa_query *query, gfp_t gfp_mask)
@@ -891,14 +884,12 @@ static int ib_nl_make_request(struct ib_sa_query *query, gfp_t gfp_mask) 
	spin_unlock_irqrestore(&ib_nl_request_lock, flags);



	ret = ib_nl_send_msg(query, gfp_mask);

	if (ret <= 0) {

	if (ret) {

		ret = -EIO;

		/* Remove the request */

		spin_lock_irqsave(&ib_nl_request_lock, flags);

		list_del(&query->list);

		spin_unlock_irqrestore(&ib_nl_request_lock, flags);

	} else {

		ret = 0;

	}



	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE