Re: [PATCH for-next 02/10] IB/core: Add flags parameter for ib_create_cq

[Yann Droneaud <ydroneaud-RlY5vtjFyJ3QT0dZR+AlfA@public.gmane.org>]

Hi,

Le dimanche 17 mai 2015 à 16:36 +0300, Or Gerlitz a écrit :
> diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c 
> b/drivers/infiniband/ulp/iser/iser_verbs.c
> index cc2dd35..922d322 100644
> --- a/drivers/infiniband/ulp/iser/iser_verbs.c
> +++ b/drivers/infiniband/ulp/iser/iser_verbs.c
> @@ -126,11 +126,9 @@ static int iser_create_device_ib_res(struct 
> iser_device *device)
>                 struct iser_comp *comp = &device->comps[i];
>  
>                 comp->device = device;
> -               comp->cq = ib_create_cq(device->ib_device,
> -                                       iser_cq_callback,
> -                                       iser_cq_event_callback,
> -                                       (void *)comp,
> -                                       max_cqe, i);
> +               comp->cq = ib_create_cq(device->ib_device, iser_cq_callback,
> +                                       iser_cq_event_callback, (void *)comp,
> +                                       max_cqe, i, 0);

Don't change indentation needlessly.


>                 if (IS_ERR(comp->cq)) {
>                         comp->cq = NULL;
>                         goto cq_err;


> diff --git a/drivers/infiniband/ulp/isert/ib_isert.c 
> b/drivers/infiniband/ulp/isert/ib_isert.c
> index 327529e..f7d9ae0 100644
> --- a/drivers/infiniband/ulp/isert/ib_isert.c
> +++ b/drivers/infiniband/ulp/isert/ib_isert.c
> @@ -320,11 +320,12 @@ isert_alloc_comps(struct isert_device *device,
>  
>                 comp->device = device;
>                 INIT_WORK(&comp->work, isert_cq_work);
> -               comp->cq = ib_create_cq(device->ib_device,
> -                                       isert_cq_callback,
> +               comp->cq = ib_create_cq(device->ib_device, isert_cq_callback,

Don't change indentation.

>                                         isert_cq_event_callback,
>                                         (void *)comp,
> -                                       max_cqe, i);
> +                                       max_cqe,
> +                                       i,
> +                                       0);
>                 if (IS_ERR(comp->cq)) {
>                         isert_err("Unable to allocate cq\n");
>                         ret = PTR_ERR(comp->cq);
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
> index ad0e2ea..1bbe4a4 100644
> --- a/include/rdma/ib_verbs.h
> +++ b/include/rdma/ib_verbs.h
> @@ -173,6 +173,10 @@ struct ib_odp_caps {
>         } per_transport_caps;
>  };
>  
> +enum ib_cq_creation_flags {
> +       IB_CQ_FLAGS_TIMESTAMP   = 1 << 0,
> +};
> +

That's must be part of a different patch, otherwise the commit message
is not true.

>  struct ib_cq_init_attr {
>         int cqe;
>         int comp_vector;

diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c
> b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> index 3df8320..cfb5915 100644
> --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
> +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
> @@ -901,21 +901,16 @@ static struct svc_xprt *svc_rdma_accept(struct
> svc_xprt *xprt)
>                 goto errout;
>         }
>         newxprt->sc_sq_cq = ib_create_cq(newxprt->sc_cm_id->device,
> -                                        sq_comp_handler,
> -                                        cq_event_handler,
> -                                        newxprt,
> -                                        newxprt->sc_sq_depth,
> -                                        0);
> +                                        sq_comp_handler, cq_event_handler,
> +                                        newxprt, newxprt->sc_sq_depth, 0, 0);

Don't change indentation.

>         if (IS_ERR(newxprt->sc_sq_cq)) {
>                 dprintk("svcrdma: error creating SQ CQ for connect
> request\n");
>                 goto errout;
>         }
>         newxprt->sc_rq_cq = ib_create_cq(newxprt->sc_cm_id->device,
> -                                        rq_comp_handler,
> -                                        cq_event_handler,
> -                                        newxprt,
> -                                        newxprt->sc_max_requests,
> -                                        0);
> +                                        rq_comp_handler, cq_event_handler,
> +                                        newxprt, newxprt->sc_max_requests,
> +                                        0, 0);

Don't change indentation.

>         if (IS_ERR(newxprt->sc_rq_cq)) {
>                 dprintk("svcrdma: error creating RQ CQ for connect
> request\n");
>                 goto errout;


Regards

-- 
Yann Droneaud
OPTEYA


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html