leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RDMA/core: Get rid of ib_create_qp_user

Browse Source 
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: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Jason Gunthorpe 2020-02-13 15:19:11 -04:00
parent b53742865e
commit b72bfc965e
2 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/infiniband/core/verbs.c
View File

@ -1127,8 +1127,7 @@ struct ib_qp *ib_open_qp(struct ib_xrcd *xrcd,
EXPORT_SYMBOL(ib_open_qp); EXPORT_SYMBOL(ib_open_qp);
static struct ib_qp *create_xrc_qp_user(struct ib_qp *qp, static struct ib_qp *create_xrc_qp_user(struct ib_qp *qp,
struct ib_qp_init_attr *qp_init_attr, struct ib_qp_init_attr *qp_init_attr)
struct ib_udata *udata)
{ {
struct ib_qp *real_qp = qp; struct ib_qp *real_qp = qp;
@ -1150,9 +1149,18 @@ static struct ib_qp *create_xrc_qp_user(struct ib_qp *qp,
return qp; return qp;
} }
struct ib_qp *ib_create_qp_user(struct ib_pd *pd, /**
struct ib_qp_init_attr *qp_init_attr, * ib_create_qp - Creates a kernel QP associated with the specified protection
struct ib_udata *udata) * 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_device *device = pd ? pd->device : qp_init_attr->xrcd->device;
struct ib_qp *qp; 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) { if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) {
struct ib_qp *xrc_qp = 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)) { if (IS_ERR(xrc_qp)) {
ret = PTR_ERR(xrc_qp); ret = PTR_ERR(xrc_qp);
@ -1253,7 +1261,7 @@ err:
return ERR_PTR(ret); return ERR_PTR(ret);
} }
EXPORT_SYMBOL(ib_create_qp_user); EXPORT_SYMBOL(ib_create_qp);
static const struct { static const struct {
int valid; int valid;

31
include/rdma/ib_verbs.h
View File

@ -3627,35 +3627,8 @@ static inline int ib_post_srq_recv(struct ib_srq *srq,
bad_recv_wr ? : &dummy); bad_recv_wr ? : &dummy);
} }
/** struct ib_qp *ib_create_qp(struct ib_pd *pd,
* ib_create_qp_user - Creates a QP associated with the specified protection struct ib_qp_init_attr *qp_init_attr);
* 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);
}
/** /**
* ib_modify_qp_with_udata - Modifies the attributes for the specified QP. * ib_modify_qp_with_udata - Modifies the attributes for the specified QP.