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

Commit da9d2f07 authored by Roland Dreier's avatar Roland Dreier
Browse files

IB/srp: Clean up error path in srp_create_target_ib() 



Instead of repeating the error unwinding steps in each place an error
can be detected, use the common idiom of gotos into an error flow.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 9c03dc9f

drivers/infiniband/ulp/srp/ib_srp.c

+18 −13
Original line number Diff line number Diff line
@@ -232,15 +232,14 @@ static int srp_create_target_ib(struct srp_target_port *target) 
				       srp_recv_completion, NULL, target, SRP_RQ_SIZE, 0);

	if (IS_ERR(target->recv_cq)) {

		ret = PTR_ERR(target->recv_cq);

		goto out;

		goto err;

	}



	target->send_cq = ib_create_cq(target->srp_host->srp_dev->dev,

				       srp_send_completion, NULL, target, SRP_SQ_SIZE, 0);

	if (IS_ERR(target->send_cq)) {

		ret = PTR_ERR(target->send_cq);

		ib_destroy_cq(target->recv_cq);

		goto out;

		goto err_recv_cq;

	}



	ib_req_notify_cq(target->recv_cq, IB_CQ_NEXT_COMP);
@@ -258,20 +257,26 @@ static int srp_create_target_ib(struct srp_target_port *target) 
	target->qp = ib_create_qp(target->srp_host->srp_dev->pd, init_attr);

	if (IS_ERR(target->qp)) {

		ret = PTR_ERR(target->qp);

		ib_destroy_cq(target->send_cq);

		ib_destroy_cq(target->recv_cq);

		goto out;

		goto err_send_cq;

	}



	ret = srp_init_qp(target, target->qp);

	if (ret) {

	if (ret)

		goto err_qp;



	kfree(init_attr);

	return 0;



err_qp:

	ib_destroy_qp(target->qp);



err_send_cq:

	ib_destroy_cq(target->send_cq);



err_recv_cq:

	ib_destroy_cq(target->recv_cq);

		goto out;

	}



out:

err:

	kfree(init_attr);

	return ret;

}