Commit b72bfc96 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/core: Get rid of ib_create_qp_user 

This function accepts a udata but does nothing with it, and is never
passed a !NULL udata. Rename it to ib_create_qp which was the only caller
and remove the udata.

Link: https://lore.kernel.org/r/20200213191911.GA9898@ziepe.ca


Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent b5374286

drivers/infiniband/core/verbs.c

+15 −7
Original line number Diff line number Diff line
@@ -1127,8 +1127,7 @@ struct ib_qp *ib_open_qp(struct ib_xrcd *xrcd, 
EXPORT_SYMBOL(ib_open_qp);



static struct ib_qp *create_xrc_qp_user(struct ib_qp *qp,

					struct ib_qp_init_attr *qp_init_attr,

					struct ib_udata *udata)

					struct ib_qp_init_attr *qp_init_attr)

{

	struct ib_qp *real_qp = qp;
@@ -1150,9 +1149,18 @@ static struct ib_qp *create_xrc_qp_user(struct ib_qp *qp, 
	return qp;

}



struct ib_qp *ib_create_qp_user(struct ib_pd *pd,

				struct ib_qp_init_attr *qp_init_attr,

				struct ib_udata *udata)

/**

 * ib_create_qp - Creates a kernel QP associated with the specified protection

 *   domain.

 * @pd: The protection domain associated with the QP.

 * @qp_init_attr: A list of initial attributes required to create the

 *   QP.  If QP creation succeeds, then the attributes are updated to

 *   the actual capabilities of the created QP.

 *

 * NOTE: for user qp use ib_create_qp_user with valid udata!

 */

struct ib_qp *ib_create_qp(struct ib_pd *pd,

			   struct ib_qp_init_attr *qp_init_attr)

{

	struct ib_device *device = pd ? pd->device : qp_init_attr->xrcd->device;

	struct ib_qp *qp;
@@ -1197,7 +1205,7 @@ struct ib_qp *ib_create_qp_user(struct ib_pd *pd, 


	if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) {

		struct ib_qp *xrc_qp =

			create_xrc_qp_user(qp, qp_init_attr, udata);

			create_xrc_qp_user(qp, qp_init_attr);



		if (IS_ERR(xrc_qp)) {

			ret = PTR_ERR(xrc_qp);
@@ -1253,7 +1261,7 @@ err: 
	return ERR_PTR(ret);



}

EXPORT_SYMBOL(ib_create_qp_user);

EXPORT_SYMBOL(ib_create_qp);



static const struct {

	int			valid;

include/rdma/ib_verbs.h

+2 −29
Original line number Diff line number Diff line
@@ -3627,35 +3627,8 @@ static inline int ib_post_srq_recv(struct ib_srq *srq, 
					      bad_recv_wr ? : &dummy);

}



/**

 * ib_create_qp_user - Creates a QP associated with the specified protection

 *   domain.

 * @pd: The protection domain associated with the QP.

 * @qp_init_attr: A list of initial attributes required to create the

 *   QP.  If QP creation succeeds, then the attributes are updated to

 *   the actual capabilities of the created QP.

 * @udata: Valid user data or NULL for kernel objects

 */

struct ib_qp *ib_create_qp_user(struct ib_pd *pd,

				struct ib_qp_init_attr *qp_init_attr,

				struct ib_udata *udata);



/**

 * ib_create_qp - Creates a kernel QP associated with the specified protection

 *   domain.

 * @pd: The protection domain associated with the QP.

 * @qp_init_attr: A list of initial attributes required to create the

 *   QP.  If QP creation succeeds, then the attributes are updated to

 *   the actual capabilities of the created QP.

 * @udata: Valid user data or NULL for kernel objects

 *

 * NOTE: for user qp use ib_create_qp_user with valid udata!

 */

static inline struct ib_qp *ib_create_qp(struct ib_pd *pd,

					 struct ib_qp_init_attr *qp_init_attr)

{

	return ib_create_qp_user(pd, qp_init_attr, NULL);

}

struct ib_qp *ib_create_qp(struct ib_pd *pd,

			   struct ib_qp_init_attr *qp_init_attr);



/**

 * ib_modify_qp_with_udata - Modifies the attributes for the specified QP.

CRA Git | Maintained and supported by SUSTech CRA and CCSE