[openib-general] Re: [PATCH] kDAPL: remove use of typedefs for structs in dapl.h
James Lentini
jlentini at netapp.com
Fri May 20 21:04:49 PDT 2005
No problem.
Committed in revision 2433.
On Fri, 20 May 2005, Tom Duffy wrote:
tduffy> James,
tduffy>
tduffy> I am sorry this is such a large patch. I had broken it out into 19
tduffy> different patches, each changing one typedef, but after the large
tduffy> changes you made today, it was going to be a big PITA to regenerate them
tduffy> all. So, I just rebased my final tree with r2431 and generated one
tduffy> large patch.
tduffy>
tduffy> This patch removes the use of many of the struct typedefs in dapl.h.
tduffy>
tduffy> Signed-off-by: Tom Duffy <tduffy at sun.com>
tduffy>
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_cq_async_error_callb.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_cq_async_error_callb.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_cq_async_error_callb.c (working copy)
tduffy> @@ -53,22 +53,19 @@
tduffy> *
tduffy> */
tduffy>
tduffy> -void
tduffy> -dapl_evd_cq_async_error_callback(struct ib_event *cause_ptr, void *context)
tduffy> +void dapl_evd_cq_async_error_callback(struct ib_event *cause_ptr, void *context)
tduffy> {
tduffy> - DAPL_EVD *async_evd;
tduffy> - DAPL_EVD *evd;
tduffy> + struct dapl_evd *async_evd;
tduffy> + struct dapl_evd *evd = context;
tduffy> u32 dat_status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_CALLBACK | DAPL_DBG_TYPE_EXCEPTION,
tduffy> "dapl_evd_cq_async_error_callback (%p, %p)\n",
tduffy> cause_ptr, context);
tduffy>
tduffy> - if (NULL == context) {
tduffy> + if (!evd)
tduffy> dapl_os_panic("NULL == context\n");
tduffy> - }
tduffy>
tduffy> - evd = (DAPL_EVD *) context;
tduffy> async_evd = evd->header.owner_ia->async_error_evd;
tduffy>
tduffy> dat_status = dapl_evd_post_async_error_event(async_evd,
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_cookie.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_cookie.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_cookie.c (working copy)
tduffy> @@ -84,9 +84,11 @@
tduffy> * *
tduffy> *********************************************************************/
tduffy>
tduffy> -u32 dapl_cb_get(DAPL_COOKIE_BUFFER *buffer, DAPL_COOKIE **cookie_ptr);
tduffy> +u32 dapl_cb_get(struct dapl_cookie_buffer *buffer,
tduffy> + struct dapl_cookie **cookie_ptr);
tduffy>
tduffy> -u32 dapl_cb_put(DAPL_COOKIE_BUFFER *buffer, DAPL_COOKIE *cookie);
tduffy> +u32 dapl_cb_put(struct dapl_cookie_buffer *buffer,
tduffy> + struct dapl_cookie *cookie);
tduffy>
tduffy> /*********************************************************************
tduffy> * *
tduffy> @@ -97,11 +99,11 @@ u32 dapl_cb_put(DAPL_COOKIE_BUFFER *buff
tduffy> /*
tduffy> * dapl_cb_create
tduffy> *
tduffy> - * Given a DAPL_COOKIE_BUFFER, allocate and initialize memory for
tduffy> + * Given a struct dapl_cookie_buffer, allocate and initialize memory for
tduffy> * the data structure.
tduffy> *
tduffy> * Input:
tduffy> - * buffer pointer to DAPL_COOKIE_BUFFER
tduffy> + * buffer pointer to struct dapl_cookie_buffer
tduffy> * ep endpoint to associate with cookies
tduffy> * size number of elements to allocate & manage
tduffy> *
tduffy> @@ -113,7 +115,8 @@ u32 dapl_cb_put(DAPL_COOKIE_BUFFER *buff
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_cb_create(DAPL_COOKIE_BUFFER *buffer, DAPL_EP *ep, int size)
tduffy> +u32 dapl_cb_create(struct dapl_cookie_buffer *buffer, struct dapl_ep *ep,
tduffy> + int size)
tduffy> {
tduffy> int i;
tduffy>
tduffy> @@ -145,7 +148,7 @@ u32 dapl_cb_create(DAPL_COOKIE_BUFFER *b
tduffy> * Free the data structure
tduffy> *
tduffy> * Input:
tduffy> - * buffer pointer to DAPL_COOKIE_BUFFER
tduffy> + * buffer pointer to struct dapl_cookie_buffer
tduffy> *
tduffy> * Output:
tduffy> * none
tduffy> @@ -154,7 +157,7 @@ u32 dapl_cb_create(DAPL_COOKIE_BUFFER *b
tduffy> * none
tduffy> *
tduffy> */
tduffy> -void dapl_cb_free(DAPL_COOKIE_BUFFER * buffer)
tduffy> +void dapl_cb_free(struct dapl_cookie_buffer *buffer)
tduffy> {
tduffy> if (NULL != buffer->pool)
tduffy> kfree(buffer->pool);
tduffy> @@ -166,7 +169,7 @@ void dapl_cb_free(DAPL_COOKIE_BUFFER * b
tduffy> * Remove an entry from the buffer
tduffy> *
tduffy> * Input:
tduffy> - * buffer pointer to DAPL_COOKIE_BUFFER
tduffy> + * buffer pointer to struct dapl_cookie_buffer
tduffy> *
tduffy> * Output:
tduffy> * cookie_ptr pointer to pointer to cookie
tduffy> @@ -177,7 +180,8 @@ void dapl_cb_free(DAPL_COOKIE_BUFFER * b
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_cb_get(DAPL_COOKIE_BUFFER *buffer, DAPL_COOKIE **cookie_ptr)
tduffy> +u32 dapl_cb_get(struct dapl_cookie_buffer *buffer,
tduffy> + struct dapl_cookie **cookie_ptr)
tduffy> {
tduffy> u32 dat_status;
tduffy> int new_head;
tduffy> @@ -195,7 +199,7 @@ u32 dapl_cb_get(DAPL_COOKIE_BUFFER *buff
tduffy> *cookie_ptr = &buffer->pool[atomic_read(&buffer->head)];
tduffy> dat_status = DAT_SUCCESS;
tduffy> }
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy>
tduffy> @@ -205,7 +209,7 @@ u32 dapl_cb_get(DAPL_COOKIE_BUFFER *buff
tduffy> * Add entry(s) to the buffer
tduffy> *
tduffy> * Input:
tduffy> - * buffer pointer to DAPL_COOKIE_BUFFER
tduffy> + * buffer pointer to struct dapl_cookie_buffer
tduffy> * cookie pointer to cookie
tduffy> *
tduffy> * Output:
tduffy> @@ -216,7 +220,7 @@ u32 dapl_cb_get(DAPL_COOKIE_BUFFER *buff
tduffy> * DAT_INSUFFICIENT_EMPTY
tduffy> *
tduffy> */
tduffy> -u32 dapl_cb_put(DAPL_COOKIE_BUFFER *buffer, DAPL_COOKIE *cookie)
tduffy> +u32 dapl_cb_put(struct dapl_cookie_buffer *buffer, struct dapl_cookie *cookie)
tduffy> {
tduffy> atomic_set(&buffer->tail, cookie->index);
tduffy>
tduffy> @@ -229,7 +233,7 @@ u32 dapl_cb_put(DAPL_COOKIE_BUFFER *buff
tduffy> * Allocate an RMR Bind cookie
tduffy> *
tduffy> * Input:
tduffy> - * buffer pointer to DAPL_COOKIE_BUFFER
tduffy> + * buffer pointer to struct dapl_cookie_buffer
tduffy> * rmr rmr to associate with the cookie
tduffy> * user_cookie user's cookie data
tduffy> *
tduffy> @@ -241,10 +245,11 @@ u32 dapl_cb_put(DAPL_COOKIE_BUFFER *buff
tduffy> * DAT_INSUFFICIENT_EMPTY
tduffy> *
tduffy> */
tduffy> -u32 dapl_rmr_cookie_alloc(DAPL_COOKIE_BUFFER *buffer, DAPL_RMR *rmr,
tduffy> - DAT_RMR_COOKIE user_cookie, DAPL_COOKIE **cookie_ptr)
tduffy> +u32 dapl_rmr_cookie_alloc(struct dapl_cookie_buffer *buffer,
tduffy> + struct dapl_rmr *rmr, DAT_RMR_COOKIE user_cookie,
tduffy> + struct dapl_cookie **cookie_ptr)
tduffy> {
tduffy> - DAPL_COOKIE *cookie;
tduffy> + struct dapl_cookie *cookie;
tduffy> u32 dat_status;
tduffy>
tduffy> if (DAT_SUCCESS != dapl_cb_get(buffer, &cookie)) {
tduffy> @@ -261,7 +266,7 @@ u32 dapl_rmr_cookie_alloc(DAPL_COOKIE_BU
tduffy>
tduffy> *cookie_ptr = cookie;
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy>
tduffy> @@ -271,7 +276,7 @@ u32 dapl_rmr_cookie_alloc(DAPL_COOKIE_BU
tduffy> * Allocate a DTO cookie
tduffy> *
tduffy> * Input:
tduffy> - * buffer pointer to DAPL_COOKIE_BUFFER
tduffy> + * buffer pointer to struct dapl_cookie_buffer
tduffy> * type DTO type
tduffy> * user_cookie user's cookie data
tduffy> *
tduffy> @@ -283,10 +288,10 @@ u32 dapl_rmr_cookie_alloc(DAPL_COOKIE_BU
tduffy> * DAT_INSUFFICIENT_EMPTY
tduffy> *
tduffy> */
tduffy> -u32 dapl_dto_cookie_alloc(DAPL_COOKIE_BUFFER *buffer, DAPL_DTO_TYPE type,
tduffy> - DAT_DTO_COOKIE user_cookie, DAPL_COOKIE **cookie_ptr)
tduffy> +u32 dapl_dto_cookie_alloc(struct dapl_cookie_buffer *buffer, DAPL_DTO_TYPE type,
tduffy> + DAT_DTO_COOKIE user_cookie, struct dapl_cookie **cookie_ptr)
tduffy> {
tduffy> - DAPL_COOKIE *cookie;
tduffy> + struct dapl_cookie *cookie;
tduffy>
tduffy> if (DAT_SUCCESS != dapl_cb_get(buffer, &cookie)) {
tduffy> *cookie_ptr = NULL;
tduffy> @@ -303,7 +308,8 @@ u32 dapl_dto_cookie_alloc(DAPL_COOKIE_BU
tduffy> return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> -void dapl_cookie_dealloc(DAPL_COOKIE_BUFFER * buffer, DAPL_COOKIE * cookie)
tduffy> +void dapl_cookie_dealloc(struct dapl_cookie_buffer *buffer,
tduffy> + struct dapl_cookie * cookie)
tduffy> {
tduffy> dapl_cb_put(buffer, cookie);
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ia_memtype_hint.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ia_memtype_hint.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ia_memtype_hint.c (working copy)
tduffy> @@ -69,13 +69,13 @@ u32 dapl_ia_memtype_hint(DAT_IA_HANDLE i
tduffy> u64 *suggested_length,
tduffy> u64 *suggested_alignment)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_ia_memtype_hint (%p)\n",
tduffy> ia_handle);
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)ia_handle;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(ia_ptr, DAPL_MAGIC_IA)) {
tduffy> dat_status =
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_connect.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_connect.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_connect.c (working copy)
tduffy> @@ -48,8 +48,7 @@ u32 dapl_ep_connect(DAT_EP_HANDLE ep_han
tduffy> int private_data_size, const void *private_data,
tduffy> enum dat_qos qos, enum dat_connect_flags connect_flags)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> - DAPL_EP alloc_ep;
tduffy> + struct dapl_ep *ep_ptr, alloc_ep;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API | DAPL_DBG_TYPE_CM,
tduffy> @@ -63,7 +62,7 @@ u32 dapl_ep_connect(DAT_EP_HANDLE ep_han
tduffy> timeout,
tduffy> private_data_size, private_data, qos, connect_flags);
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy>
tduffy> /*
tduffy> * Verify parameter & state. The connection handle must be good
tduffy> @@ -174,7 +173,7 @@ u32 dapl_ep_connect(DAT_EP_HANDLE ep_han
tduffy> /* test connect handle */
tduffy> || ep_ptr->param.connect_evd_handle == NULL
tduffy> || DAPL_BAD_HANDLE(ep_ptr->param.connect_evd_handle, DAPL_MAGIC_EVD)
tduffy> - || !(((DAPL_EVD *) ep_ptr->param.connect_evd_handle)->
tduffy> + || !(((struct dapl_evd *)ep_ptr->param.connect_evd_handle)->
tduffy> evd_flags & DAT_EVD_CONNECTION_FLAG)
tduffy> /* test optional completion handles */
tduffy> || (ep_ptr->param.recv_evd_handle != DAT_HANDLE_NULL &&
tduffy> @@ -261,8 +260,8 @@ u32 dapl_ep_connect(DAT_EP_HANDLE ep_han
tduffy> * this happens, return SUCCESS and generate the event
tduffy> */
tduffy> if (dat_status == DAT_ERROR(DAT_INTERNAL_ERROR, 1)) {
tduffy> - dapl_evd_post_connection_event((DAPL_EVD *) ep_ptr->
tduffy> - param.
tduffy> + dapl_evd_post_connection_event((struct dapl_evd *)
tduffy> + ep_ptr->param.
tduffy> connect_evd_handle,
tduffy> DAT_CONNECTION_EVENT_UNREACHABLE,
tduffy> (DAT_HANDLE) ep_ptr, 0,
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_cookie.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_cookie.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_cookie.h (working copy)
tduffy> @@ -36,20 +36,21 @@
tduffy>
tduffy> #include "dapl.h"
tduffy>
tduffy> -extern u32 dapl_cb_create(DAPL_COOKIE_BUFFER *buffer, DAPL_EP *ep,
tduffy> +extern u32 dapl_cb_create(struct dapl_cookie_buffer *buffer, struct dapl_ep *ep,
tduffy> int size);
tduffy>
tduffy> -extern void dapl_cb_free(DAPL_COOKIE_BUFFER *buffer);
tduffy> +extern void dapl_cb_free(struct dapl_cookie_buffer *buffer);
tduffy>
tduffy> -extern u32 dapl_rmr_cookie_alloc(DAPL_COOKIE_BUFFER *buffer, DAPL_RMR *rmr,
tduffy> +extern u32 dapl_rmr_cookie_alloc(struct dapl_cookie_buffer *buffer,
tduffy> + struct dapl_rmr *rmr,
tduffy> DAT_RMR_COOKIE user_cookie,
tduffy> - DAPL_COOKIE **cookie_ptr);
tduffy> + struct dapl_cookie **cookie_ptr);
tduffy>
tduffy> -extern u32 dapl_dto_cookie_alloc(DAPL_COOKIE_BUFFER *buffer,
tduffy> +extern u32 dapl_dto_cookie_alloc(struct dapl_cookie_buffer *buffer,
tduffy> DAPL_DTO_TYPE type, DAT_DTO_COOKIE user_cookie,
tduffy> - DAPL_COOKIE **cookie_ptr);
tduffy> + struct dapl_cookie **cookie_ptr);
tduffy>
tduffy> -extern void
tduffy> -dapl_cookie_dealloc(DAPL_COOKIE_BUFFER * buffer, DAPL_COOKIE * cookie);
tduffy> +extern void dapl_cookie_dealloc(struct dapl_cookie_buffer *buffer,
tduffy> + struct dapl_cookie *cookie);
tduffy>
tduffy> #endif /* DAPL_COOKIE_H */
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_cr_callback.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_cr_callback.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_cr_callback.c (working copy)
tduffy> @@ -45,11 +45,13 @@
tduffy> /*
tduffy> * Prototypes
tduffy> */
tduffy> -u32 dapl_connection_request(struct dapl_cm_id *ib_cm_handle, DAPL_SP *sp_ptr,
tduffy> - const void *prd_ptr, DAPL_EVD *evd_ptr);
tduffy> -
tduffy> -DAPL_EP *dapl_get_sp_ep(struct dapl_cm_id *ib_cm_handle, DAPL_SP * sp_ptr,
tduffy> - enum dat_event_number event);
tduffy> +u32 dapl_connection_request(struct dapl_cm_id *ib_cm_handle,
tduffy> + struct dapl_sp *sp_ptr, const void *prd_ptr,
tduffy> + struct dapl_evd *evd_ptr);
tduffy> +
tduffy> +struct dapl_ep *dapl_get_sp_ep(struct dapl_cm_id *ib_cm_handle,
tduffy> + struct dapl_sp *sp_ptr,
tduffy> + enum dat_event_number dat_event_num);
tduffy>
tduffy> /*
tduffy> * The callback function registered with verbs for passive side of
tduffy> @@ -60,9 +62,9 @@ void dapl_cr_callback(struct dapl_cm_id
tduffy> const void *private_data_ptr, /* event data */
tduffy> const void *context)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> - DAPL_EVD *evd_ptr;
tduffy> - DAPL_SP *sp_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> + struct dapl_sp *sp_ptr;
tduffy> u32 dat_status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_CM | DAPL_DBG_TYPE_CALLBACK,
tduffy> @@ -73,7 +75,7 @@ void dapl_cr_callback(struct dapl_cm_id
tduffy> * Passive side of the connection, context is a SP and
tduffy> * we need to look up the EP.
tduffy> */
tduffy> - sp_ptr = (DAPL_SP *) context;
tduffy> + sp_ptr = (struct dapl_sp *)context;
tduffy> /*
tduffy> * The context pointer could have been cleaned up in a racing
tduffy> * CM callback, check to see if we should just exit here
tduffy> @@ -106,7 +108,7 @@ void dapl_cr_callback(struct dapl_cm_id
tduffy> if (ep_ptr == NULL) {
tduffy> return;
tduffy> }
tduffy> - evd_ptr = (DAPL_EVD *) ep_ptr->param.connect_evd_handle;
tduffy> + evd_ptr = (struct dapl_evd *)ep_ptr->param.connect_evd_handle;
tduffy> /* if something has happened to our EVD, bail. */
tduffy> if (evd_ptr == NULL) {
tduffy> return;
tduffy> @@ -259,13 +261,14 @@ void dapl_cr_callback(struct dapl_cm_id
tduffy> * Create a CR record and link it on to the SP so we can update it
tduffy> * and free it later. Create an EP if specified by the PSP flags.
tduffy> */
tduffy> -u32 dapl_connection_request(struct dapl_cm_id *ib_cm_handle, DAPL_SP *sp_ptr,
tduffy> - const void *prd_ptr, DAPL_EVD *evd_ptr)
tduffy> +u32 dapl_connection_request(struct dapl_cm_id *ib_cm_handle,
tduffy> + struct dapl_sp *sp_ptr, const void *prd_ptr,
tduffy> + struct dapl_evd *evd_ptr)
tduffy> {
tduffy> u32 dat_status;
tduffy> - DAPL_CR *cr_ptr;
tduffy> - DAPL_EP *ep_ptr;
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_cr *cr_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> DAT_SP_HANDLE sp_handle;
tduffy>
tduffy> cr_ptr = dapl_cr_alloc(sp_ptr->header.owner_ia);
tduffy> @@ -295,7 +298,7 @@ u32 dapl_connection_request(struct dapl_
tduffy> }
tduffy>
tduffy> /* EP will be NULL unless RSP service point */
tduffy> - ep_ptr = (DAPL_EP *) sp_ptr->ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)sp_ptr->ep_handle;
tduffy>
tduffy> if (sp_ptr->psp_flags == DAT_PSP_PROVIDER_FLAG) {
tduffy> /*
tduffy> @@ -362,11 +365,12 @@ u32 dapl_connection_request(struct dapl_
tduffy> * up resources and obtain the EP pointer associated with a CR in
tduffy> * the SP.
tduffy> */
tduffy> -DAPL_EP *dapl_get_sp_ep(struct dapl_cm_id *ib_cm_handle,
tduffy> - DAPL_SP * sp_ptr, enum dat_event_number event)
tduffy> +struct dapl_ep *dapl_get_sp_ep(struct dapl_cm_id *ib_cm_handle,
tduffy> + struct dapl_sp *sp_ptr,
tduffy> + enum dat_event_number event)
tduffy> {
tduffy> - DAPL_CR *cr_ptr;
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_cr *cr_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy>
tduffy> /*
tduffy> * acquire the lock, we may be racing with other threads here
tduffy> @@ -391,7 +395,7 @@ DAPL_EP *dapl_get_sp_ep(struct dapl_cm_i
tduffy> return NULL;
tduffy> }
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) cr_ptr->param.local_ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)cr_ptr->param.local_ep_handle;
tduffy>
tduffy> /* Quick check to ensure our EP is still valid */
tduffy> if ((DAPL_BAD_HANDLE(ep_ptr, DAPL_MAGIC_EP))) {
tduffy> @@ -427,8 +431,7 @@ DAPL_EP *dapl_get_sp_ep(struct dapl_cm_i
tduffy> sp_ptr);
tduffy> /* Decrement the ref count on the EVD */
tduffy> if (sp_ptr->evd_handle) {
tduffy> - atomic_dec(&
tduffy> - ((DAPL_EVD *) sp_ptr->
tduffy> + atomic_dec(&((struct dapl_evd *)sp_ptr->
tduffy> evd_handle)->evd_ref_count);
tduffy> sp_ptr->evd_handle = NULL;
tduffy> }
tduffy> @@ -437,7 +440,8 @@ DAPL_EP *dapl_get_sp_ep(struct dapl_cm_i
tduffy> sp_ptr->header.flags);
tduffy> (void)dapl_ib_remove_conn_listener(sp_ptr->header.
tduffy> owner_ia, sp_ptr);
tduffy> - dapl_ia_unlink_sp((DAPL_IA *) sp_ptr->header.owner_ia,
tduffy> + dapl_ia_unlink_sp((struct dapl_ia *)
tduffy> + sp_ptr->header.owner_ia,
tduffy> sp_ptr);
tduffy> dapl_sp_dealloc(sp_ptr);
tduffy> dapl_cr_free(cr_ptr);
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_dto_callb.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_dto_callb.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_dto_callb.c (working copy)
tduffy> @@ -70,7 +70,7 @@
tduffy>
tduffy> void dapl_evd_dto_callback(struct ib_cq *cq_handle, void *user_context)
tduffy> {
tduffy> - DAPL_EVD *evd_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> u32 dat_status;
tduffy> DAPL_EVD_STATE state;
tduffy>
tduffy> @@ -78,7 +78,7 @@ void dapl_evd_dto_callback(struct ib_cq
tduffy> "dapl_evd_dto_callback(%p, %p)\n",
tduffy> cq_handle, user_context);
tduffy>
tduffy> - evd_ptr = (DAPL_EVD *) user_context;
tduffy> + evd_ptr = (struct dapl_evd *)user_context;
tduffy>
tduffy> dapl_os_assert(evd_ptr->ib_cq_handle == cq_handle);
tduffy> dapl_os_assert(evd_ptr->header.magic == DAPL_MAGIC_EVD);
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_rmr_create.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_rmr_create.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_rmr_create.c (working copy)
tduffy> @@ -55,8 +55,8 @@
tduffy> */
tduffy> u32 dapl_rmr_create(DAT_PZ_HANDLE pz_handle, DAT_RMR_HANDLE *rmr_handle)
tduffy> {
tduffy> - DAPL_PZ *pz;
tduffy> - DAPL_RMR *rmr;
tduffy> + struct dapl_pz *pz;
tduffy> + struct dapl_rmr *rmr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(pz_handle, DAPL_MAGIC_PZ)) {
tduffy> @@ -65,7 +65,7 @@ u32 dapl_rmr_create(DAT_PZ_HANDLE pz_han
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - pz = (DAPL_PZ *) pz_handle;
tduffy> + pz = (struct dapl_pz *)pz_handle;
tduffy>
tduffy> rmr = dapl_rmr_alloc(pz);
tduffy>
tduffy> @@ -89,6 +89,6 @@ u32 dapl_rmr_create(DAT_PZ_HANDLE pz_han
tduffy>
tduffy> *rmr_handle = rmr;
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_lmr_sync_rdma_read.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_lmr_sync_rdma_read.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_lmr_sync_rdma_read.c (working copy)
tduffy> @@ -60,14 +60,14 @@ u32 dapl_lmr_sync_rdma_read(DAT_IA_HANDL
tduffy> const struct dat_lmr_triplet *local_segments,
tduffy> u64 num_segments)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> "dat_lmr_sync_rdma_read (%p, %p, %ld)\n",
tduffy> ia_handle, local_segments, num_segments);
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)ia_handle;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(ia_ptr, DAPL_MAGIC_IA)) {
tduffy> dat_status =
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_module.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_module.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_module.c (working copy)
tduffy> @@ -120,7 +120,7 @@ void DAT_PROVIDER_INIT_FUNC_NAME(const s
tduffy> struct ib_device *device, u8 port)
tduffy> {
tduffy> struct dat_provider *provider;
tduffy> - DAPL_HCA *hca_ptr;
tduffy> + struct dapl_hca *hca_ptr;
tduffy> u32 dat_status;
tduffy>
tduffy> provider = NULL;
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ring_buffer_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ring_buffer_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ring_buffer_util.c (working copy)
tduffy> @@ -40,12 +40,12 @@
tduffy> /*
tduffy> * dapl_rbuf_alloc
tduffy> *
tduffy> - * Given a DAPL_RING_BUFFER, initialize it and provide memory for
tduffy> + * Given a struct dapl_ring_buffer, initialize it and provide memory for
tduffy> * the ringbuf itself. A passed in size will be adjusted to the next
tduffy> * largest power of two number to simplify management.
tduffy> *
tduffy> * Input:
tduffy> - * rbuf pointer to DAPL_RING_BUFFER
tduffy> + * rbuf pointer to struct dapl_ring_buffer
tduffy> * size number of elements to allocate & manage
tduffy> *
tduffy> * Output:
tduffy> @@ -56,7 +56,7 @@
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_rbuf_alloc(DAPL_RING_BUFFER *rbuf, int size)
tduffy> +u32 dapl_rbuf_alloc(struct dapl_ring_buffer *rbuf, int size)
tduffy> {
tduffy> unsigned int rsize; /* real size */
tduffy>
tduffy> @@ -86,12 +86,12 @@ u32 dapl_rbuf_alloc(DAPL_RING_BUFFER *rb
tduffy> /*
tduffy> * dapl_rbuf_realloc
tduffy> *
tduffy> - * Resizes an empty DAPL_RING_BUFFER. This function is not thread safe;
tduffy> + * Resizes an empty struct dapl_ring_buffer. This function is not thread safe;
tduffy> * adding or removing elements from a ring buffer while resizing
tduffy> * will have indeterminate results.
tduffy> *
tduffy> * Input:
tduffy> - * rbuf pointer to DAPL_RING_BUFFER
tduffy> + * rbuf pointer to struct dapl_ring_buffer
tduffy> * size number of elements to allocate & manage
tduffy> *
tduffy> * Output:
tduffy> @@ -103,10 +103,10 @@ u32 dapl_rbuf_alloc(DAPL_RING_BUFFER *rb
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_rbuf_realloc(DAPL_RING_BUFFER *rbuf, int size)
tduffy> +u32 dapl_rbuf_realloc(struct dapl_ring_buffer *rbuf, int size)
tduffy> {
tduffy> - DAPL_RING_BUFFER new_rbuf;
tduffy> - void *entry;
tduffy> + struct dapl_ring_buffer new_rbuf;
tduffy> + void *entry;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> /* decreasing the size or retaining the old size is not allowed */
tduffy> @@ -146,10 +146,10 @@ u32 dapl_rbuf_realloc(DAPL_RING_BUFFER *
tduffy> /*
tduffy> * dapl_rbuf_destroy
tduffy> *
tduffy> - * Release the buffer and reset pointers to a DAPL_RING_BUFFER
tduffy> + * Release the buffer and reset pointers to a struct dapl_ring_buffer
tduffy> *
tduffy> * Input:
tduffy> - * rbuf pointer to DAPL_RING_BUFFER
tduffy> + * rbuf pointer to struct dapl_ring_buffer
tduffy> *
tduffy> * Output:
tduffy> * none
tduffy> @@ -158,7 +158,7 @@ u32 dapl_rbuf_realloc(DAPL_RING_BUFFER *
tduffy> * none
tduffy> *
tduffy> */
tduffy> -void dapl_rbuf_destroy(DAPL_RING_BUFFER * rbuf)
tduffy> +void dapl_rbuf_destroy(struct dapl_ring_buffer *rbuf)
tduffy> {
tduffy> if ((NULL == rbuf) || (NULL == rbuf->base)) {
tduffy> return;
tduffy> @@ -177,7 +177,7 @@ void dapl_rbuf_destroy(DAPL_RING_BUFFER
tduffy> * Add an entry to the ring buffer
tduffy> *
tduffy> * Input:
tduffy> - * rbuf pointer to DAPL_RING_BUFFER
tduffy> + * rbuf pointer to struct dapl_ring_buffer
tduffy> * entry entry to add
tduffy> *
tduffy> * Output:
tduffy> @@ -188,7 +188,7 @@ void dapl_rbuf_destroy(DAPL_RING_BUFFER
tduffy> * DAT_INSUFFICIENT_RESOURCES (queue full)
tduffy> *
tduffy> */
tduffy> -u32 dapl_rbuf_add(DAPL_RING_BUFFER *rbuf, void *entry)
tduffy> +u32 dapl_rbuf_add(struct dapl_ring_buffer *rbuf, void *entry)
tduffy> {
tduffy> int pos;
tduffy> int val;
tduffy> @@ -214,7 +214,7 @@ u32 dapl_rbuf_add(DAPL_RING_BUFFER *rbuf
tduffy> * Remove an entry from the ring buffer
tduffy> *
tduffy> * Input:
tduffy> - * rbuf pointer to DAPL_RING_BUFFER
tduffy> + * rbuf pointer to struct dapl_ring_buffer
tduffy> *
tduffy> * Output:
tduffy> * entry entry removed from the ring buffer
tduffy> @@ -224,7 +224,7 @@ u32 dapl_rbuf_add(DAPL_RING_BUFFER *rbuf
tduffy> * DAT_QUEUE_EMPTY
tduffy>
tduffy> */
tduffy> -void *dapl_rbuf_remove(DAPL_RING_BUFFER * rbuf)
tduffy> +void *dapl_rbuf_remove(struct dapl_ring_buffer *rbuf)
tduffy> {
tduffy> int pos;
tduffy> int val;
tduffy> @@ -250,7 +250,7 @@ void *dapl_rbuf_remove(DAPL_RING_BUFFER
tduffy> * Return the number of entries in use in the ring buffer
tduffy> *
tduffy> * Input:
tduffy> - * rbuf pointer to DAPL_RING_BUFFER
tduffy> + * rbuf pointer to struct dapl_ring_buffer
tduffy> *
tduffy> *
tduffy> * Output:
tduffy> @@ -260,7 +260,7 @@ void *dapl_rbuf_remove(DAPL_RING_BUFFER
tduffy> * count of entries
tduffy> *
tduffy> */
tduffy> -int dapl_rbuf_count(DAPL_RING_BUFFER * rbuf)
tduffy> +int dapl_rbuf_count(struct dapl_ring_buffer *rbuf)
tduffy> {
tduffy> int count, head, tail;
tduffy>
tduffy> @@ -286,7 +286,7 @@ int dapl_rbuf_count(DAPL_RING_BUFFER * r
tduffy> * functions).
tduffy> *
tduffy> * Input:
tduffy> - * rbuf pointer to DAPL_RING_BUFFER
tduffy> + * rbuf pointer to struct dapl_ring_buffer
tduffy> * offset offset to adjust elemnt addresss by,
tduffy> * used for addresses of type void *
tduffy> * Output:
tduffy> @@ -295,7 +295,7 @@ int dapl_rbuf_count(DAPL_RING_BUFFER * r
tduffy> * Returns:
tduffy> * none
tduffy> */
tduffy> -void dapl_rbuf_adjust(DAPL_RING_BUFFER * rbuf, unsigned long offset)
tduffy> +void dapl_rbuf_adjust(struct dapl_ring_buffer *rbuf, unsigned long offset)
tduffy> {
tduffy> int pos;
tduffy>
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_psp_create.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_psp_create.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_psp_create.c (working copy)
tduffy> @@ -71,13 +71,13 @@ u32 dapl_psp_create(DAT_IA_HANDLE ia_han
tduffy> DAT_EVD_HANDLE evd_handle, enum dat_psp_flags psp_flags,
tduffy> DAT_PSP_HANDLE *psp_handle)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_SP *sp_ptr;
tduffy> - DAPL_EVD *evd_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> + struct dapl_sp *sp_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> boolean_t sp_found;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)ia_handle;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(ia_ptr, DAPL_MAGIC_IA)) {
tduffy> dat_status =
tduffy> @@ -95,7 +95,7 @@ u32 dapl_psp_create(DAT_IA_HANDLE ia_han
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - evd_ptr = (DAPL_EVD *) evd_handle;
tduffy> + evd_ptr = (struct dapl_evd *)evd_handle;
tduffy> if (!(evd_ptr->evd_flags & DAT_EVD_CR_FLAG)) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_HANDLE, DAT_INVALID_HANDLE_EVD_CR);
tduffy> @@ -141,7 +141,7 @@ u32 dapl_psp_create(DAT_IA_HANDLE ia_han
tduffy> /*
tduffy> * Take a reference on the EVD handle
tduffy> */
tduffy> - atomic_inc(&((DAPL_EVD *) evd_handle)->evd_ref_count);
tduffy> + atomic_inc(&((struct dapl_evd *)evd_handle)->evd_ref_count);
tduffy>
tduffy> /*
tduffy> * Set up a listener for a connection. Connections can arrive
tduffy> @@ -168,7 +168,7 @@ u32 dapl_psp_create(DAT_IA_HANDLE ia_han
tduffy> * Have a problem setting up the connection, something
tduffy> * wrong! Decrements the EVD refcount & release it.
tduffy> */
tduffy> - atomic_dec(&((DAPL_EVD *) evd_handle)->
tduffy> + atomic_dec(&((struct dapl_evd *)evd_handle)->
tduffy> evd_ref_count);
tduffy> sp_ptr->evd_handle = NULL;
tduffy> dapl_ia_unlink_sp(ia_ptr, sp_ptr);
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_srq_resize.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_srq_resize.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_srq_resize.c (working copy)
tduffy> @@ -65,8 +65,8 @@
tduffy>
tduffy> u32 dapl_srq_resize(DAT_SRQ_HANDLE srq_handle, int srq_max_recv_dto)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_SRQ *srq_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> + struct dapl_srq *srq_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_srq_resize (%p, %d)\n",
tduffy> @@ -78,7 +78,7 @@ u32 dapl_srq_resize(DAT_SRQ_HANDLE srq_h
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - srq_ptr = (DAPL_SRQ *) srq_handle;
tduffy> + srq_ptr = (struct dapl_srq *)srq_handle;
tduffy> ia_ptr = srq_ptr->header.owner_ia;
tduffy>
tduffy> /*
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_create.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_create.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_create.c (working copy)
tduffy> @@ -69,8 +69,8 @@ u32 dapl_ep_create(DAT_IA_HANDLE ia_hand
tduffy> DAT_EVD_HANDLE connect_evd_handle,
tduffy> const struct dat_ep_attr *ep_attr, DAT_EP_HANDLE *ep_handle)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> struct dat_ep_attr *ep_attr_limit;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> @@ -82,7 +82,7 @@ u32 dapl_ep_create(DAT_IA_HANDLE ia_hand
tduffy> request_evd_handle,
tduffy> connect_evd_handle, ep_attr, ep_handle);
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)ia_handle;
tduffy>
tduffy> /*
tduffy> * Verify parameters
tduffy> @@ -109,7 +109,7 @@ u32 dapl_ep_create(DAT_IA_HANDLE ia_hand
tduffy> /* If connect handle is !NULL verify handle is good */
tduffy> if (connect_evd_handle != DAT_HANDLE_NULL &&
tduffy> (DAPL_BAD_HANDLE(connect_evd_handle, DAPL_MAGIC_EVD) ||
tduffy> - !(((DAPL_EVD *) connect_evd_handle)->
tduffy> + !(((struct dapl_evd *)connect_evd_handle)->
tduffy> evd_flags & DAT_EVD_CONNECTION_FLAG))) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_HANDLE, DAT_INVALID_HANDLE_EVD_CONN);
tduffy> @@ -119,7 +119,7 @@ u32 dapl_ep_create(DAT_IA_HANDLE ia_hand
tduffy> /* If recv_evd is !NULL, verify handle is good and flags are valid */
tduffy> if (recv_evd_handle != DAT_HANDLE_NULL &&
tduffy> (DAPL_BAD_HANDLE(recv_evd_handle, DAPL_MAGIC_EVD) ||
tduffy> - !(((DAPL_EVD *) recv_evd_handle)->evd_flags & DAT_EVD_DTO_FLAG))) {
tduffy> + !(((struct dapl_evd *)recv_evd_handle)->evd_flags & DAT_EVD_DTO_FLAG))) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_HANDLE, DAT_INVALID_HANDLE_EVD_RECV);
tduffy> goto bail;
tduffy> @@ -128,7 +128,7 @@ u32 dapl_ep_create(DAT_IA_HANDLE ia_hand
tduffy> /* If req_evd is !NULL, verify handle is good and flags are valid */
tduffy> if (request_evd_handle != DAT_HANDLE_NULL &&
tduffy> (DAPL_BAD_HANDLE(request_evd_handle, DAPL_MAGIC_EVD) ||
tduffy> - !(((DAPL_EVD *) request_evd_handle)->
tduffy> + !(((struct dapl_evd *)request_evd_handle)->
tduffy> evd_flags & DAT_EVD_DTO_FLAG))) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_HANDLE,
tduffy> @@ -210,13 +210,11 @@ u32 dapl_ep_create(DAT_IA_HANDLE ia_hand
tduffy> /*
tduffy> * Make sure we handle the NULL DTO EVDs
tduffy> */
tduffy> - if (recv_evd_handle == DAT_HANDLE_NULL && ep_attr == NULL) {
tduffy> + if (recv_evd_handle == DAT_HANDLE_NULL && ep_attr == NULL)
tduffy> ep_ptr->param.ep_attr.max_recv_dtos = 0;
tduffy> - }
tduffy>
tduffy> - if (request_evd_handle == DAT_HANDLE_NULL && ep_attr == NULL) {
tduffy> + if (request_evd_handle == DAT_HANDLE_NULL && ep_attr == NULL)
tduffy> ep_ptr->param.ep_attr.max_request_dtos = 0;
tduffy> - }
tduffy>
tduffy> /*
tduffy> * If the user has specified a PZ handle we allocate a QP for
tduffy> @@ -226,7 +224,7 @@ u32 dapl_ep_create(DAT_IA_HANDLE ia_hand
tduffy> */
tduffy> if (pz_handle != DAT_HANDLE_NULL) {
tduffy> /* Take a reference on the PZ handle */
tduffy> - atomic_inc(&((DAPL_PZ *) pz_handle)->pz_ref_count);
tduffy> + atomic_inc(&((struct dapl_pz *)pz_handle)->pz_ref_count);
tduffy>
tduffy> /*
tduffy> * Get a QP from the IB provider
tduffy> @@ -234,14 +232,12 @@ u32 dapl_ep_create(DAT_IA_HANDLE ia_hand
tduffy> dat_status = dapl_ib_qp_alloc(ia_ptr, ep_ptr, ep_ptr);
tduffy>
tduffy> if (dat_status != DAT_SUCCESS) {
tduffy> - atomic_dec(&((DAPL_PZ *) pz_handle)->
tduffy> - pz_ref_count);
tduffy> + atomic_dec(&((struct dapl_pz *)pz_handle)->pz_ref_count);
tduffy> dapl_ep_dealloc(ep_ptr);
tduffy> goto bail;
tduffy> }
tduffy> - } else {
tduffy> + } else
tduffy> ep_ptr->qp_state = DAPL_QP_STATE_UNATTACHED;
tduffy> - }
tduffy>
tduffy> /*
tduffy> * Update ref counts. See the spec where the endpoint marks
tduffy> @@ -251,22 +247,20 @@ u32 dapl_ep_create(DAT_IA_HANDLE ia_hand
tduffy> *
tduffy> * N.B. This should really be done by a util routine.
tduffy> */
tduffy> - atomic_inc(&((DAPL_EVD *) connect_evd_handle)->evd_ref_count);
tduffy> + atomic_inc(&((struct dapl_evd *)connect_evd_handle)->evd_ref_count);
tduffy> /* Optional handles */
tduffy> - if (recv_evd_handle != DAT_HANDLE_NULL) {
tduffy> - atomic_inc(&((DAPL_EVD *) recv_evd_handle)->
tduffy> + if (recv_evd_handle != DAT_HANDLE_NULL)
tduffy> + atomic_inc(&((struct dapl_evd *)recv_evd_handle)->
tduffy> evd_ref_count);
tduffy> - }
tduffy> - if (request_evd_handle != DAT_HANDLE_NULL) {
tduffy> - atomic_inc(&((DAPL_EVD *) request_evd_handle)->
tduffy> + if (request_evd_handle != DAT_HANDLE_NULL)
tduffy> + atomic_inc(&((struct dapl_evd *)request_evd_handle)->
tduffy> evd_ref_count);
tduffy> - }
tduffy>
tduffy> /* Link it onto the IA */
tduffy> dapl_ia_link_ep(ia_ptr, ep_ptr);
tduffy>
tduffy> *ep_handle = ep_ptr;
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_lmr_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_lmr_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_lmr_util.c (working copy)
tduffy> @@ -38,14 +38,12 @@
tduffy> #include "dapl_lmr_util.h"
tduffy> #include "dapl_ia_util.h"
tduffy>
tduffy> -DAPL_LMR *dapl_lmr_alloc(DAPL_IA * ia,
tduffy> - enum dat_mem_type mem_type,
tduffy> - DAT_REGION_DESCRIPTION region_desc,
tduffy> - u64 length,
tduffy> - DAT_PZ_HANDLE pz_handle,
tduffy> - enum dat_mem_priv_flags mem_priv)
tduffy> +struct dapl_lmr *dapl_lmr_alloc(struct dapl_ia *ia, enum dat_mem_type mem_type,
tduffy> + DAT_REGION_DESCRIPTION region_desc, u64 length,
tduffy> + DAT_PZ_HANDLE pz_handle,
tduffy> + enum dat_mem_priv_flags mem_priv)
tduffy> {
tduffy> - DAPL_LMR *lmr;
tduffy> + struct dapl_lmr *lmr;
tduffy>
tduffy> /* Allocate LMR */
tduffy> lmr = kmalloc(sizeof *lmr, GFP_ATOMIC);
tduffy> @@ -82,9 +80,10 @@ DAPL_LMR *dapl_lmr_alloc(DAPL_IA * ia,
tduffy> return lmr;
tduffy> }
tduffy>
tduffy> -void dapl_lmr_dealloc(DAPL_LMR * lmr)
tduffy> +void dapl_lmr_dealloc(struct dapl_lmr *lmr)
tduffy> {
tduffy> - lmr->header.magic = DAPL_MAGIC_INVALID; /* reset magic to prevent reuse */
tduffy> + /* reset magic to prevent reuse */
tduffy> + lmr->header.magic = DAPL_MAGIC_INVALID;
tduffy> dapl_ia_unlink_lmr(lmr->header.owner_ia, lmr);
tduffy> /* no need to destroy lmr->header.lock */
tduffy>
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_openib_dto.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_openib_dto.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_openib_dto.h (working copy)
tduffy> @@ -49,7 +49,8 @@
tduffy> *
tduffy> * Provider specific Post RECV function
tduffy> */
tduffy> -static inline u32 dapl_ib_post_recv(DAPL_EP *ep_ptr, DAPL_COOKIE *cookie,
tduffy> +static inline u32 dapl_ib_post_recv(struct dapl_ep *ep_ptr,
tduffy> + struct dapl_cookie *cookie,
tduffy> int num_segments,
tduffy> struct dat_lmr_triplet *local_iov)
tduffy> {
tduffy> @@ -98,8 +99,9 @@ static inline u32 dapl_ib_post_recv(DAPL
tduffy> *
tduffy> * Provider specific Post SEND function
tduffy> */
tduffy> -static inline u32 dapl_ib_post_send(DAPL_EP *ep_ptr, enum ib_wr_opcode op_type,
tduffy> - DAPL_COOKIE *cookie,
tduffy> +static inline u32 dapl_ib_post_send(struct dapl_ep *ep_ptr,
tduffy> + enum ib_wr_opcode op_type,
tduffy> + struct dapl_cookie *cookie,
tduffy> int num_segments,
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> const struct dat_rmr_triplet *remote_iov,
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_hca_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_hca_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_hca_util.c (working copy)
tduffy> @@ -56,9 +56,9 @@
tduffy> * none
tduffy> *
tduffy> */
tduffy> -DAPL_HCA *dapl_hca_alloc(char *name, struct ib_device *device, u8 port)
tduffy> +struct dapl_hca *dapl_hca_alloc(char *name, struct ib_device *device, u8 port)
tduffy> {
tduffy> - DAPL_HCA *hca_ptr;
tduffy> + struct dapl_hca *hca_ptr;
tduffy>
tduffy> hca_ptr = kmalloc(sizeof *hca_ptr, GFP_ATOMIC);
tduffy> if (hca_ptr) {
tduffy> @@ -101,7 +101,7 @@ DAPL_HCA *dapl_hca_alloc(char *name, str
tduffy> * none
tduffy> *
tduffy> */
tduffy> -void dapl_hca_free(DAPL_HCA * hca_ptr)
tduffy> +void dapl_hca_free(struct dapl_hca *hca_ptr)
tduffy> {
tduffy> (void)dapl_hash_free(hca_ptr->lmr_hash_table);
tduffy> kfree(hca_ptr->name);
tduffy> @@ -124,7 +124,7 @@ void dapl_hca_free(DAPL_HCA * hca_ptr)
tduffy> * none
tduffy> *
tduffy> */
tduffy> -void dapl_hca_link_ia(DAPL_HCA * hca_ptr, DAPL_IA * ia_ptr)
tduffy> +void dapl_hca_link_ia(struct dapl_hca *hca_ptr, struct dapl_ia *ia_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&hca_ptr->lock, hca_ptr->flags);
tduffy> dapl_llist_add_head(&hca_ptr->ia_list_head,
tduffy> @@ -148,7 +148,7 @@ void dapl_hca_link_ia(DAPL_HCA * hca_ptr
tduffy> * none
tduffy> *
tduffy> */
tduffy> -void dapl_hca_unlink_ia(DAPL_HCA * hca_ptr, DAPL_IA * ia_ptr)
tduffy> +void dapl_hca_unlink_ia(struct dapl_hca *hca_ptr, struct dapl_ia *ia_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&hca_ptr->lock, hca_ptr->flags);
tduffy> /*
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_srq_create.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_srq_create.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_srq_create.c (working copy)
tduffy> @@ -68,15 +68,15 @@
tduffy> u32 dapl_srq_create(DAT_IA_HANDLE ia_handle, DAT_PZ_HANDLE pz_handle,
tduffy> struct dat_srq_attr *srq_attr, DAT_SRQ_HANDLE *srq_handle)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_SRQ *srq_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> + struct dapl_srq *srq_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> "dapl_srq_create (%p, %p, %p, %p)\n",
tduffy> ia_handle, pz_handle, srq_attr, srq_handle);
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)ia_handle;
tduffy>
tduffy> /*
tduffy> * Verify parameters
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_connection_callb.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_connection_callb.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_connection_callb.c (working copy)
tduffy> @@ -65,8 +65,8 @@ void dapl_evd_connection_callback(struct
tduffy> const void *private_data_ptr,
tduffy> const void *context)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> - DAPL_EVD *evd_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> int private_data_size;
tduffy> u32 dat_status;
tduffy>
tduffy> @@ -78,17 +78,15 @@ void dapl_evd_connection_callback(struct
tduffy> * Determine the type of handle passed back to us in the context
tduffy> * and sort out key parameters.
tduffy> */
tduffy> - if (context == NULL
tduffy> - || ((DAPL_HEADER *) context)->magic != DAPL_MAGIC_EP) {
tduffy> + if (context == NULL || ((struct dapl_header *) context)->magic != DAPL_MAGIC_EP)
tduffy> return;
tduffy> - }
tduffy>
tduffy> /*
tduffy> * Active side of the connection, context is an EP and
tduffy> * PSP is irrelevant.
tduffy> */
tduffy> - ep_ptr = (DAPL_EP *) context;
tduffy> - evd_ptr = (DAPL_EVD *) ep_ptr->param.connect_evd_handle;
tduffy> + ep_ptr = (struct dapl_ep *)context;
tduffy> + evd_ptr = (struct dapl_evd *)ep_ptr->param.connect_evd_handle;
tduffy>
tduffy> private_data_size = 0;
tduffy> /*
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_srq_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_srq_query.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_srq_query.c (working copy)
tduffy> @@ -41,7 +41,7 @@
tduffy>
tduffy> u32 dapl_srq_query(DAT_SRQ_HANDLE srq_handle, struct dat_srq_param *srq_param)
tduffy> {
tduffy> - DAPL_SRQ *srq_ptr;
tduffy> + struct dapl_srq *srq_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> @@ -58,7 +58,7 @@ u32 dapl_srq_query(DAT_SRQ_HANDLE srq_ha
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - srq_ptr = (DAPL_SRQ *) srq_handle;
tduffy> + srq_ptr = (struct dapl_srq *)srq_handle;
tduffy>
tduffy> /*
tduffy> * XXX Need to calculate available_dto_count and outstanding_dto_count
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ring_buffer_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ring_buffer_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ring_buffer_util.h (working copy)
tduffy> @@ -42,19 +42,19 @@
tduffy> /*
tduffy> * Prototypes
tduffy> */
tduffy> -u32 dapl_rbuf_alloc(DAPL_RING_BUFFER *rbuf, int size);
tduffy> +u32 dapl_rbuf_alloc(struct dapl_ring_buffer *rbuf, int size);
tduffy>
tduffy> -u32 dapl_rbuf_realloc(DAPL_RING_BUFFER *rbuf, int size);
tduffy> +u32 dapl_rbuf_realloc(struct dapl_ring_buffer *rbuf, int size);
tduffy>
tduffy> -void dapl_rbuf_destroy(DAPL_RING_BUFFER * rbuf);
tduffy> +void dapl_rbuf_destroy(struct dapl_ring_buffer *rbuf);
tduffy>
tduffy> -u32 dapl_rbuf_add(DAPL_RING_BUFFER *rbuf, void *entry);
tduffy> +u32 dapl_rbuf_add(struct dapl_ring_buffer *rbuf, void *entry);
tduffy>
tduffy> -void *dapl_rbuf_remove(DAPL_RING_BUFFER * rbuf);
tduffy> +void *dapl_rbuf_remove(struct dapl_ring_buffer *rbuf);
tduffy>
tduffy> -int dapl_rbuf_count(DAPL_RING_BUFFER *rbuf);
tduffy> +int dapl_rbuf_count(struct dapl_ring_buffer *rbuf);
tduffy>
tduffy> -void dapl_rbuf_adjust(DAPL_RING_BUFFER * rbuf, unsigned long offset);
tduffy> +void dapl_rbuf_adjust(struct dapl_ring_buffer *rbuf, unsigned long offset);
tduffy>
tduffy> /*
tduffy> * Simple functions
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_psp_create_any.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_psp_create_any.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_psp_create_any.c (working copy)
tduffy> @@ -74,15 +74,15 @@ u32 dapl_psp_create_any(DAT_IA_HANDLE ia
tduffy> DAT_EVD_HANDLE evd_handle, enum dat_psp_flags psp_flags,
tduffy> DAT_PSP_HANDLE *psp_handle)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_SP *sp_ptr;
tduffy> - DAPL_EVD *evd_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> + struct dapl_sp *sp_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> static DAT_CONN_QUAL hint_conn_qual = 1000; /* seed value */
tduffy> DAT_CONN_QUAL lcl_conn_qual;
tduffy> DAT_CONN_QUAL limit_conn_qual;
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)ia_handle;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(ia_ptr, DAPL_MAGIC_IA)) {
tduffy> dat_status =
tduffy> @@ -104,7 +104,7 @@ u32 dapl_psp_create_any(DAT_IA_HANDLE ia
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - evd_ptr = (DAPL_EVD *) evd_handle;
tduffy> + evd_ptr = (struct dapl_evd *)evd_handle;
tduffy> if (!(evd_ptr->evd_flags & DAT_EVD_CR_FLAG)) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_HANDLE, DAT_INVALID_HANDLE_EVD_CR);
tduffy> @@ -136,7 +136,7 @@ u32 dapl_psp_create_any(DAT_IA_HANDLE ia
tduffy> /*
tduffy> * Take a reference on the EVD handle
tduffy> */
tduffy> - atomic_inc(&((DAPL_EVD *) evd_handle)->evd_ref_count);
tduffy> + atomic_inc(&((struct dapl_evd *)evd_handle)->evd_ref_count);
tduffy>
tduffy> /* Link it onto the IA */
tduffy> dapl_ia_link_psp(ia_ptr, sp_ptr);
tduffy> @@ -176,7 +176,7 @@ u32 dapl_psp_create_any(DAT_IA_HANDLE ia
tduffy> /*
tduffy> * Have a problem setting up the connection, something wrong!
tduffy> */
tduffy> - atomic_dec(&((DAPL_EVD *) evd_handle)->evd_ref_count);
tduffy> + atomic_dec(&((struct dapl_evd *)evd_handle)->evd_ref_count);
tduffy> sp_ptr->evd_handle = NULL;
tduffy> dapl_ia_unlink_sp(ia_ptr, sp_ptr);
tduffy> dapl_sp_dealloc(sp_ptr);
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_lmr_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_lmr_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_lmr_util.h (working copy)
tduffy> @@ -39,19 +39,12 @@
tduffy>
tduffy> #include "dapl_mr_util.h"
tduffy>
tduffy> -/*********************************************************************
tduffy> - * *
tduffy> - * Function Prototypes *
tduffy> - * *
tduffy> - *********************************************************************/
tduffy> +extern struct dapl_lmr *dapl_lmr_alloc(struct dapl_ia *ia,
tduffy> + enum dat_mem_type mem_type,
tduffy> + DAT_REGION_DESCRIPTION region_desc,
tduffy> + u64 length, DAT_PZ_HANDLE pz_handle,
tduffy> + enum dat_mem_priv_flags mem_priv);
tduffy>
tduffy> -extern DAPL_LMR *dapl_lmr_alloc(DAPL_IA * ia,
tduffy> - enum dat_mem_type mem_type,
tduffy> - DAT_REGION_DESCRIPTION region_desc,
tduffy> - u64 length,
tduffy> - DAT_PZ_HANDLE pz_handle,
tduffy> - enum dat_mem_priv_flags mem_priv);
tduffy> +extern void dapl_lmr_dealloc(struct dapl_lmr *lmr);
tduffy>
tduffy> -extern void dapl_lmr_dealloc(DAPL_LMR * lmr);
tduffy> -
tduffy> -#endif /* DAPL_LMR_UTIL_H */
tduffy> +#endif /* DAPL_LMR_UTIL_H */
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_hca_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_hca_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_hca_util.h (working copy)
tduffy> @@ -39,12 +39,12 @@
tduffy>
tduffy> #include "dapl.h"
tduffy>
tduffy> -DAPL_HCA *dapl_hca_alloc(char *, struct ib_device *, u8 port);
tduffy> +struct dapl_hca *dapl_hca_alloc(char *name, struct ib_device *device, u8 port);
tduffy>
tduffy> -void dapl_hca_free(DAPL_HCA * hca_ptr);
tduffy> +void dapl_hca_free(struct dapl_hca *hca_ptr);
tduffy>
tduffy> -void dapl_hca_link_ia(DAPL_HCA * hca_ptr, DAPL_IA * ia_info);
tduffy> +void dapl_hca_link_ia(struct dapl_hca *hca_ptr, struct dapl_ia *ia_info);
tduffy>
tduffy> -void dapl_hca_unlink_ia(DAPL_HCA * hca_ptr, DAPL_IA * ia_info);
tduffy> +void dapl_hca_unlink_ia(struct dapl_hca *hca_ptr, struct dapl_ia *ia_info);
tduffy>
tduffy> #endif
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_get_consumer_context.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_get_consumer_context.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_get_consumer_context.c (working copy)
tduffy> @@ -58,9 +58,9 @@
tduffy> u32 dapl_get_consumer_context(DAT_HANDLE dat_handle, DAT_CONTEXT *context)
tduffy> {
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> - DAPL_HEADER *header;
tduffy> + struct dapl_header *header;
tduffy>
tduffy> - header = (DAPL_HEADER *) dat_handle;
tduffy> + header = (struct dapl_header *)dat_handle;
tduffy> if (((header) == NULL) ||
tduffy> ((unsigned long)(header) & 3) ||
tduffy> (header->magic != DAPL_MAGIC_IA &&
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_resize.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_resize.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_resize.c (working copy)
tduffy> @@ -65,8 +65,8 @@
tduffy>
tduffy> u32 dapl_evd_resize(DAT_EVD_HANDLE evd_handle, int evd_qlen)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_EVD *evd_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> int pend_cnt;
tduffy> u32 status;
tduffy>
tduffy> @@ -78,7 +78,7 @@ u32 dapl_evd_resize(DAT_EVD_HANDLE evd_h
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - evd_ptr = (DAPL_EVD *) evd_handle;
tduffy> + evd_ptr = (struct dapl_evd *)evd_handle;
tduffy> ia_ptr = evd_ptr->header.owner_ia;
tduffy>
tduffy> if (evd_qlen == evd_ptr->qlen) {
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_cr_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_cr_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_cr_util.c (working copy)
tduffy> @@ -37,9 +37,9 @@
tduffy> /*
tduffy> * Create a CR. Part of the passive side of a connection
tduffy> */
tduffy> -DAPL_CR *dapl_cr_alloc(DAPL_IA * ia_ptr)
tduffy> +struct dapl_cr *dapl_cr_alloc(struct dapl_ia *ia_ptr)
tduffy> {
tduffy> - DAPL_CR *cr_ptr;
tduffy> + struct dapl_cr *cr_ptr;
tduffy>
tduffy> /* Allocate EP */
tduffy> cr_ptr = kmalloc(sizeof *cr_ptr, GFP_ATOMIC);
tduffy> @@ -67,11 +67,11 @@ DAPL_CR *dapl_cr_alloc(DAPL_IA * ia_ptr)
tduffy> /*
tduffy> * Free the passed in EP structure.
tduffy> */
tduffy> -void dapl_cr_free(DAPL_CR * cr_ptr)
tduffy> +void dapl_cr_free(struct dapl_cr *cr_ptr)
tduffy> {
tduffy> dapl_os_assert(cr_ptr->header.magic == DAPL_MAGIC_CR ||
tduffy> cr_ptr->header.magic == DAPL_MAGIC_CR_DESTROYED);
tduffy> -
tduffy> - cr_ptr->header.magic = DAPL_MAGIC_INVALID; /* reset magic to prevent reuse */
tduffy> + /* reset magic to prevent reuse */
tduffy> + cr_ptr->header.magic = DAPL_MAGIC_INVALID;
tduffy> kfree(cr_ptr);
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_rmr_free.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_rmr_free.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_rmr_free.c (working copy)
tduffy> @@ -55,7 +55,7 @@
tduffy> */
tduffy> u32 dapl_rmr_free(DAT_RMR_HANDLE rmr_handle)
tduffy> {
tduffy> - DAPL_RMR *rmr;
tduffy> + struct dapl_rmr *rmr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(rmr_handle, DAPL_MAGIC_RMR)) {
tduffy> @@ -64,7 +64,7 @@ u32 dapl_rmr_free(DAT_RMR_HANDLE rmr_han
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - rmr = (DAPL_RMR *) rmr_handle;
tduffy> + rmr = (struct dapl_rmr *)rmr_handle;
tduffy>
tduffy> /*
tduffy> * If the user did not perform an unbind op, release
tduffy> @@ -77,14 +77,13 @@ u32 dapl_rmr_free(DAT_RMR_HANDLE rmr_han
tduffy>
tduffy> dat_status = dapl_ib_mw_free(rmr);
tduffy>
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> goto bail;
tduffy> - }
tduffy>
tduffy> atomic_dec(&rmr->pz->pz_ref_count);
tduffy>
tduffy> dapl_rmr_dealloc(rmr);
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_srq_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_srq_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_srq_util.c (working copy)
tduffy> @@ -54,9 +54,10 @@
tduffy> * pointer to srq
tduffy> *
tduffy> */
tduffy> -DAPL_SRQ *dapl_srq_alloc(DAPL_IA * ia_ptr, const struct dat_srq_attr *srq_attr)
tduffy> +struct dapl_srq *dapl_srq_alloc(struct dapl_ia *ia_ptr,
tduffy> + const struct dat_srq_attr *srq_attr)
tduffy> {
tduffy> - DAPL_SRQ *srq_ptr;
tduffy> + struct dapl_srq *srq_ptr;
tduffy>
tduffy> /* Allocate SRQ */
tduffy> srq_ptr = kmalloc(sizeof *srq_ptr, GFP_ATOMIC);
tduffy> @@ -89,14 +90,15 @@ DAPL_SRQ *dapl_srq_alloc(DAPL_IA * ia_pt
tduffy> srq_ptr->param.low_watermark = srq_attr->low_watermark;
tduffy>
tduffy> /* Get a cookie buffer to track outstanding recvs */
tduffy> - if (DAT_SUCCESS != dapl_cb_create(&srq_ptr->recv_buffer, (DAPL_EP *) srq_ptr, /* just saves the value */
tduffy> + if (DAT_SUCCESS != dapl_cb_create(&srq_ptr->recv_buffer,
tduffy> + (struct dapl_ep *)srq_ptr,
tduffy> srq_ptr->param.max_recv_dtos)) {
tduffy> dapl_srq_dealloc(srq_ptr);
tduffy> srq_ptr = NULL;
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return srq_ptr;
tduffy> }
tduffy>
tduffy> @@ -115,11 +117,12 @@ DAPL_SRQ *dapl_srq_alloc(DAPL_IA * ia_pt
tduffy> * none
tduffy> *
tduffy> */
tduffy> -void dapl_srq_dealloc(DAPL_SRQ * srq_ptr)
tduffy> +void dapl_srq_dealloc(struct dapl_srq *srq_ptr)
tduffy> {
tduffy> dapl_os_assert(srq_ptr->header.magic == DAPL_MAGIC_SRQ);
tduffy>
tduffy> - srq_ptr->header.magic = DAPL_MAGIC_INVALID; /* reset magic to prevent reuse */
tduffy> + /* reset magic to prevent reuse */
tduffy> + srq_ptr->header.magic = DAPL_MAGIC_INVALID;
tduffy> dapl_ia_unlink_srq(srq_ptr->header.owner_ia, srq_ptr);
tduffy> dapl_cb_free(&srq_ptr->recv_buffer);
tduffy> /* no need to destroy srq_ptr->header.lock */
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_psp_free.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_psp_free.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_psp_free.c (working copy)
tduffy> @@ -60,12 +60,12 @@
tduffy> */
tduffy> u32 dapl_psp_free(DAT_PSP_HANDLE psp_handle)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_SP *sp_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> + struct dapl_sp *sp_ptr;
tduffy> DAPL_SP_STATE save_state;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> - sp_ptr = (DAPL_SP *) psp_handle;
tduffy> + sp_ptr = (struct dapl_sp *)psp_handle;
tduffy> /*
tduffy> * Verify handle
tduffy> */
tduffy> @@ -77,7 +77,7 @@ u32 dapl_psp_free(DAT_PSP_HANDLE psp_han
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - /* ia_ptr = (DAPL_IA *)sp_ptr->header.owner_ia; */
tduffy> + /* ia_ptr = (struct dapl_ia *)sp_ptr->header.owner_ia; */
tduffy> ia_ptr = sp_ptr->header.owner_ia;
tduffy> /*
tduffy> * Remove the connection listener if it has been established
tduffy> @@ -94,7 +94,7 @@ u32 dapl_psp_free(DAT_PSP_HANDLE psp_han
tduffy> * free the evd_handle will be NULL
tduffy> */
tduffy> if (sp_ptr->evd_handle) {
tduffy> - atomic_dec(&((DAPL_EVD *) sp_ptr->evd_handle)->
tduffy> + atomic_dec(&((struct dapl_evd *)sp_ptr->evd_handle)->
tduffy> evd_ref_count);
tduffy> sp_ptr->evd_handle = NULL;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_free.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_free.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_free.c (working copy)
tduffy> @@ -63,15 +63,15 @@
tduffy> */
tduffy> u32 dapl_ep_free(DAT_EP_HANDLE ep_handle)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> struct dat_ep_param *param;
tduffy> enum ib_qp_state save_qp_state;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_ep_free (%p)\n", ep_handle);
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy> param = &ep_ptr->param;
tduffy>
tduffy> /*
tduffy> @@ -129,22 +129,21 @@ u32 dapl_ep_free(DAT_EP_HANDLE ep_handle
tduffy> * is idempotent.
tduffy> */
tduffy> if (param->pz_handle != NULL) {
tduffy> - atomic_dec(&((DAPL_PZ *) param->pz_handle)->
tduffy> - pz_ref_count);
tduffy> + atomic_dec(&((struct dapl_pz *)param->pz_handle)->pz_ref_count);
tduffy> param->pz_handle = NULL;
tduffy> }
tduffy> if (param->recv_evd_handle != NULL) {
tduffy> - atomic_dec(&((DAPL_EVD *) param->recv_evd_handle)->
tduffy> + atomic_dec(&((struct dapl_evd *)param->recv_evd_handle)->
tduffy> evd_ref_count);
tduffy> param->recv_evd_handle = NULL;
tduffy> }
tduffy> if (param->request_evd_handle != NULL) {
tduffy> - atomic_dec(&((DAPL_EVD *) param->request_evd_handle)->
tduffy> + atomic_dec(&((struct dapl_evd *)param->request_evd_handle)->
tduffy> evd_ref_count);
tduffy> param->request_evd_handle = NULL;
tduffy> }
tduffy> if (param->connect_evd_handle != NULL) {
tduffy> - atomic_dec(&((DAPL_EVD *) param->connect_evd_handle)->
tduffy> + atomic_dec(&((struct dapl_evd *)param->connect_evd_handle)->
tduffy> evd_ref_count);
tduffy> param->connect_evd_handle = NULL;
tduffy> }
tduffy> @@ -181,7 +180,7 @@ u32 dapl_ep_free(DAT_EP_HANDLE ep_handle
tduffy> /* Free the resource */
tduffy> dapl_ep_dealloc(ep_ptr);
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy>
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_get_status.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_get_status.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_get_status.c (working copy)
tduffy> @@ -62,14 +62,14 @@
tduffy> u32 dapl_ep_get_status(DAT_EP_HANDLE ep_handle, enum dat_ep_state *ep_state,
tduffy> boolean_t *in_dto_idle, boolean_t *out_dto_idle)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> "dapl_ep_get_status (%p, %p, %p, %p)\n",
tduffy> ep_handle, ep_state, in_dto_idle, out_dto_idle);
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy>
tduffy> /*
tduffy> * Verify parameter & state
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_cr_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_cr_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_cr_util.h (working copy)
tduffy> @@ -36,12 +36,12 @@
tduffy>
tduffy> #include "dapl.h"
tduffy>
tduffy> -DAPL_CR *dapl_cr_alloc(DAPL_IA * ia_ptr);
tduffy> +struct dapl_cr *dapl_cr_alloc(struct dapl_ia *ia_ptr);
tduffy>
tduffy> -void dapl_cr_free(DAPL_CR * cr_ptr);
tduffy> +void dapl_cr_free(struct dapl_cr *cr_ptr);
tduffy>
tduffy> void dapl_cr_callback(struct dapl_cm_id *ib_cm_handle,
tduffy> const enum dat_event_number event,
tduffy> const void *instant_data_p, const void *context);
tduffy>
tduffy> -#endif /* DAPL_CR_UTIL_H */
tduffy> +#endif /* DAPL_CR_UTIL_H */
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_srq_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_srq_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_srq_util.h (working copy)
tduffy> @@ -39,11 +39,9 @@
tduffy>
tduffy> #include "dapl.h"
tduffy>
tduffy> -/* function prototypes */
tduffy> +extern struct dapl_srq *dapl_srq_alloc(struct dapl_ia *ia,
tduffy> + const struct dat_srq_attr *srq_attr);
tduffy>
tduffy> -extern DAPL_SRQ *dapl_srq_alloc(DAPL_IA * ia,
tduffy> - const struct dat_srq_attr *srq_attr);
tduffy> +extern void dapl_srq_dealloc(struct dapl_srq *srq_ptr);
tduffy>
tduffy> -extern void dapl_srq_dealloc(DAPL_SRQ * srq_ptr);
tduffy> -
tduffy> -#endif /* DAPL_SRQ_UTIL_H */
tduffy> +#endif /* DAPL_SRQ_UTIL_H */
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_post_se.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_post_se.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_post_se.c (working copy)
tduffy> @@ -61,10 +61,10 @@
tduffy>
tduffy> u32 dapl_evd_post_se(DAT_EVD_HANDLE evd_handle, const struct dat_event *event)
tduffy> {
tduffy> - DAPL_EVD *evd_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> - evd_ptr = (DAPL_EVD *) evd_handle;
tduffy> + evd_ptr = (struct dapl_evd *)evd_handle;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(evd_handle, DAPL_MAGIC_EVD)) {
tduffy> dat_status = DAT_ERROR(DAT_INVALID_HANDLE, 0);
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_set_consumer_context.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_set_consumer_context.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_set_consumer_context.c (working copy)
tduffy> @@ -59,9 +59,9 @@
tduffy> u32 dapl_set_consumer_context(DAT_HANDLE dat_handle, DAT_CONTEXT context)
tduffy> {
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> - DAPL_HEADER *header;
tduffy> + struct dapl_header *header;
tduffy>
tduffy> - header = (DAPL_HEADER *) dat_handle;
tduffy> + header = (struct dapl_header *)dat_handle;
tduffy> if (((header) == NULL) ||
tduffy> ((unsigned long)(header) & 3) ||
tduffy> (header->magic != DAPL_MAGIC_IA &&
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_mr_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_mr_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_mr_util.c (working copy)
tduffy> @@ -58,13 +58,13 @@
tduffy>
tduffy> u64 dapl_mr_get_address(DAT_REGION_DESCRIPTION desc, enum dat_mem_type type)
tduffy> {
tduffy> - DAPL_LMR *lmr;
tduffy> + struct dapl_lmr *lmr;
tduffy>
tduffy> switch (type) {
tduffy> case DAT_MEM_TYPE_VIRTUAL:
tduffy> return (u64) (unsigned long) desc.for_va;
tduffy> case DAT_MEM_TYPE_LMR:
tduffy> - lmr = (DAPL_LMR *) desc.for_lmr_handle;
tduffy> + lmr = (struct dapl_lmr *)desc.for_lmr_handle;
tduffy>
tduffy> /* Since this function is recoursive we cannot inline it */
tduffy> return dapl_mr_get_address(lmr->param.region_desc,
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_pz_create.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_pz_create.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_pz_create.c (working copy)
tduffy> @@ -57,8 +57,8 @@
tduffy> */
tduffy> u32 dapl_pz_create(DAT_IA_HANDLE ia_handle, DAT_PZ_HANDLE *pz_handle)
tduffy> {
tduffy> - DAPL_IA *ia;
tduffy> - DAPL_PZ *pz;
tduffy> + struct dapl_ia *ia;
tduffy> + struct dapl_pz *pz;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> @@ -75,7 +75,7 @@ u32 dapl_pz_create(DAT_IA_HANDLE ia_hand
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - ia = (DAPL_IA *) ia_handle;
tduffy> + ia = (struct dapl_ia *)ia_handle;
tduffy>
tduffy> pz = dapl_pz_alloc(ia);
tduffy> if (NULL == pz) {
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ia_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ia_query.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ia_query.c (working copy)
tduffy> @@ -62,7 +62,7 @@ u32 dapl_ia_query(DAT_IA_HANDLE ia_handl
tduffy> struct dat_ia_attr *ia_attr,
tduffy> struct dat_provider_attr *provider_attr)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> struct evd_merge_type {
tduffy> boolean_t array[6][6];
tduffy> @@ -78,7 +78,7 @@ u32 dapl_ia_query(DAT_IA_HANDLE ia_handl
tduffy> ia_attr,
tduffy> provider_attr);
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)ia_handle;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(ia_ptr, DAPL_MAGIC_IA)) {
tduffy> dat_status =
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_pz_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_pz_query.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_pz_query.c (working copy)
tduffy> @@ -38,7 +38,7 @@
tduffy>
tduffy> u32 dapl_pz_query(DAT_PZ_HANDLE pz_handle, struct dat_pz_param *pz_param)
tduffy> {
tduffy> - DAPL_PZ *pz;
tduffy> + struct dapl_pz *pz;
tduffy> u32 status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_pz_query (%p, %x, %p)\n",
tduffy> @@ -53,7 +53,7 @@ u32 dapl_pz_query(DAT_PZ_HANDLE pz_handl
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - pz = (DAPL_PZ *) pz_handle;
tduffy> + pz = (struct dapl_pz *)pz_handle;
tduffy> pz_param->ia_handle = (DAT_IA_HANDLE) pz->header.owner_ia;
tduffy> status = DAT_SUCCESS;
tduffy>
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_free.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_free.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_free.c (working copy)
tduffy> @@ -41,13 +41,13 @@
tduffy> */
tduffy> u32 dapl_evd_free(DAT_EVD_HANDLE evd_handle)
tduffy> {
tduffy> - DAPL_EVD *evd_ptr;
tduffy> - DAPL_CNO *cno_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> + struct dapl_cno *cno_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_evd_free (%p)\n", evd_handle);
tduffy>
tduffy> - evd_ptr = (DAPL_EVD *) evd_handle;
tduffy> + evd_ptr = (struct dapl_evd *)evd_handle;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(evd_handle, DAPL_MAGIC_EVD)) {
tduffy> dat_status = DAT_ERROR(DAT_INVALID_HANDLE, 0);
tduffy> @@ -72,10 +72,10 @@ u32 dapl_evd_free(DAT_EVD_HANDLE evd_han
tduffy> dapl_ia_link_evd(evd_ptr->header.owner_ia, evd_ptr);
tduffy> }
tduffy>
tduffy> - if (cno_ptr != NULL)
tduffy> - dapl_cno_dealloc (cno_ptr);
tduffy> + if (cno_ptr)
tduffy> + dapl_cno_dealloc(cno_ptr);
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_RTN,
tduffy> "dapl_evd_free () returns 0x%x\n", dat_status);
tduffy>
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_lmr_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_lmr_query.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_lmr_query.c (working copy)
tduffy> @@ -38,7 +38,7 @@
tduffy>
tduffy> u32 dapl_lmr_query(DAT_LMR_HANDLE lmr_handle, struct dat_lmr_param *lmr_param)
tduffy> {
tduffy> - DAPL_LMR *lmr;
tduffy> + struct dapl_lmr *lmr;
tduffy> u32 dat_status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> @@ -56,10 +56,10 @@ u32 dapl_lmr_query(DAT_LMR_HANDLE lmr_ha
tduffy> }
tduffy>
tduffy> dat_status = DAT_SUCCESS;
tduffy> - lmr = (DAPL_LMR *) lmr_handle;
tduffy> + lmr = (struct dapl_lmr *)lmr_handle;
tduffy>
tduffy> memcpy(lmr_param, &lmr->param, sizeof *lmr_param);
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_rmr_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_rmr_query.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_rmr_query.c (working copy)
tduffy> @@ -40,7 +40,7 @@
tduffy>
tduffy> u32 dapl_rmr_query(DAT_RMR_HANDLE rmr_handle, struct dat_rmr_param *rmr_param)
tduffy> {
tduffy> - DAPL_RMR *rmr;
tduffy> + struct dapl_rmr *rmr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(rmr_handle, DAPL_MAGIC_RMR)) {
tduffy> @@ -53,10 +53,10 @@ u32 dapl_rmr_query(DAT_RMR_HANDLE rmr_ha
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - rmr = (DAPL_RMR *) rmr_handle;
tduffy> + rmr = (struct dapl_rmr *)rmr_handle;
tduffy>
tduffy> memcpy(rmr_param, &rmr->param, sizeof *rmr_param);
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_modify_upcall.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_modify_upcall.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_modify_upcall.c (working copy)
tduffy> @@ -47,14 +47,14 @@ u32 dapl_evd_modify_upcall(DAT_EVD_HANDL
tduffy> enum dat_upcall_policy upcall_policy, /* ignore */
tduffy> const struct dat_upcall_object *upcall)
tduffy> {
tduffy> - DAPL_EVD *evd_ptr;
tduffy> - DAPL_CNO *cno_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> + struct dapl_cno *cno_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_modify_upcall (%p)\n",
tduffy> evd_handle);
tduffy>
tduffy> - evd_ptr = (DAPL_EVD *) evd_handle;
tduffy> + evd_ptr = (struct dapl_evd *)evd_handle;
tduffy> cno_ptr = evd_ptr->cno_ptr;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(evd_handle, DAPL_MAGIC_EVD)) {
tduffy> @@ -62,12 +62,11 @@ u32 dapl_evd_modify_upcall(DAT_EVD_HANDL
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - if (cno_ptr != NULL)
tduffy> - {
tduffy> + if (cno_ptr != NULL) {
tduffy> cno_ptr->cno_upcall_policy = upcall_policy;
tduffy> cno_ptr->cno_upcall = *upcall;
tduffy> }
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ia_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ia_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ia_util.c (working copy)
tduffy> @@ -58,9 +58,10 @@
tduffy> * none
tduffy> *
tduffy> */
tduffy> -DAPL_IA *dapl_ia_alloc(struct dat_provider *provider, DAPL_HCA * hca_ptr)
tduffy> +struct dapl_ia *dapl_ia_alloc(struct dat_provider *provider,
tduffy> + struct dapl_hca *hca_ptr)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy>
tduffy> /* Allocate IA */
tduffy> ia_ptr = kmalloc(sizeof *ia_ptr, GFP_ATOMIC);
tduffy> @@ -106,17 +107,17 @@ DAPL_IA *dapl_ia_alloc(struct dat_provid
tduffy> * Performs an abrupt close of the IA
tduffy> */
tduffy>
tduffy> -u32 dapl_ia_abrupt_close(DAPL_IA *ia_ptr)
tduffy> +u32 dapl_ia_abrupt_close(struct dapl_ia *ia_ptr)
tduffy> {
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> - DAPL_EP *ep_ptr, *next_ep_ptr;
tduffy> - DAPL_LMR *lmr_ptr, *next_lmr_ptr;
tduffy> - DAPL_RMR *rmr_ptr, *next_rmr_ptr;
tduffy> - DAPL_PZ *pz_ptr, *next_pz_ptr;
tduffy> - DAPL_EVD *evd_ptr, *next_evd_ptr;
tduffy> - DAPL_SP *sp_ptr, *next_sp_ptr; /* for PSP and RSP queues */
tduffy> - DAPL_CR *cr_ptr, *next_cr_ptr;
tduffy> - DAPL_HCA *hca_ptr;
tduffy> + struct dapl_ep *ep_ptr, *next_ep_ptr;
tduffy> + struct dapl_lmr *lmr_ptr, *next_lmr_ptr;
tduffy> + struct dapl_rmr *rmr_ptr, *next_rmr_ptr;
tduffy> + struct dapl_pz *pz_ptr, *next_pz_ptr;
tduffy> + struct dapl_evd *evd_ptr, *next_evd_ptr;
tduffy> + struct dapl_sp *sp_ptr, *next_sp_ptr; /* for PSP and RSP queues */
tduffy> + struct dapl_cr *cr_ptr, *next_cr_ptr;
tduffy> + struct dapl_hca *hca_ptr;
tduffy>
tduffy> /*
tduffy> * clear all the data structures associated with the IA.
tduffy> @@ -135,11 +136,10 @@ u32 dapl_ia_abrupt_close(DAPL_IA *ia_ptr
tduffy> &rmr_ptr->header.
tduffy> ia_list_entry);
tduffy> dat_status = dapl_rmr_free(rmr_ptr);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_WARN,
tduffy> "ia_close(ABRUPT): rmr_free(%p) returns %x\n",
tduffy> rmr_ptr, dat_status);
tduffy> - }
tduffy> rmr_ptr = next_rmr_ptr;
tduffy> }
tduffy>
tduffy> @@ -150,11 +150,10 @@ u32 dapl_ia_abrupt_close(DAPL_IA *ia_ptr
tduffy> &sp_ptr->header.
tduffy> ia_list_entry);
tduffy> dat_status = dapl_rsp_free(sp_ptr);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_WARN,
tduffy> "ia_close(ABRUPT): rsp_free(%p) returns %x\n",
tduffy> sp_ptr, dat_status);
tduffy> - }
tduffy> sp_ptr = next_sp_ptr;
tduffy> }
tduffy>
tduffy> @@ -176,21 +175,19 @@ u32 dapl_ia_abrupt_close(DAPL_IA *ia_ptr
tduffy> DAT_EP_STATE_DISCONNECT_PENDING) {
tduffy> dat_status =
tduffy> dapl_ep_disconnect(ep_ptr, DAT_CLOSE_ABRUPT_FLAG);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_WARN,
tduffy> "ia_close(ABRUPT): ep_disconnect(%p) returns %x\n",
tduffy> ep_ptr, dat_status);
tduffy> - }
tduffy> }
tduffy> /* force the EP into error state to force flush all posted DTOs. */
tduffy> (void) dapl_modify_qp_state_to_error(ep_ptr->qp_handle);
tduffy>
tduffy> dat_status = dapl_ep_free(ep_ptr);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_WARN,
tduffy> "ia_close(ABRUPT): ep_free(%p) returns %x\n",
tduffy> ep_ptr, dat_status);
tduffy> - }
tduffy> ep_ptr = next_ep_ptr;
tduffy> }
tduffy>
tduffy> @@ -201,11 +198,10 @@ u32 dapl_ia_abrupt_close(DAPL_IA *ia_ptr
tduffy> &lmr_ptr->header.
tduffy> ia_list_entry);
tduffy> dat_status = dapl_lmr_free(lmr_ptr);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_WARN,
tduffy> "ia_close(ABRUPT): lmr_free(%p) returns %x\n",
tduffy> lmr_ptr, dat_status);
tduffy> - }
tduffy> lmr_ptr = next_lmr_ptr;
tduffy> }
tduffy>
tduffy> @@ -217,11 +213,10 @@ u32 dapl_ia_abrupt_close(DAPL_IA *ia_ptr
tduffy> * should be no competing threads after this.
tduffy> */
tduffy> dat_status = dapl_ib_remove_conn_listener(ia_ptr, sp_ptr);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_WARN,
tduffy> "ia_close(ABRUPT): psp cannot remove listener, returns %x\n",
tduffy> dat_status);
tduffy> - }
tduffy>
tduffy> next_sp_ptr = dapl_llist_next_entry(&ia_ptr->psp_list_head,
tduffy> &sp_ptr->header.
tduffy> @@ -245,11 +240,10 @@ u32 dapl_ia_abrupt_close(DAPL_IA *ia_ptr
tduffy> }
tduffy>
tduffy> dat_status = dapl_psp_free(sp_ptr);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_WARN,
tduffy> "ia_close(ABRUPT): psp_free(%p) returns %x\n",
tduffy> sp_ptr, dat_status);
tduffy> - }
tduffy>
tduffy> sp_ptr = next_sp_ptr;
tduffy> }
tduffy> @@ -261,11 +255,10 @@ u32 dapl_ia_abrupt_close(DAPL_IA *ia_ptr
tduffy> &pz_ptr->header.
tduffy> ia_list_entry);
tduffy> dat_status = dapl_pz_free(pz_ptr);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_WARN,
tduffy> "ia_close(ABRUPT): pz_free(%p) returns %x\n",
tduffy> pz_ptr, dat_status);
tduffy> - }
tduffy> pz_ptr = next_pz_ptr;
tduffy> }
tduffy>
tduffy> @@ -284,11 +277,10 @@ u32 dapl_ia_abrupt_close(DAPL_IA *ia_ptr
tduffy> if (evd_ptr != ia_ptr->async_error_evd) {
tduffy> /* it isn't the async EVD; delete it. */
tduffy> dat_status = dapl_evd_free(evd_ptr);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_WARN,
tduffy> "ia_close(ABRUPT): evd_free(%p) returns %x\n",
tduffy> evd_ptr, dat_status);
tduffy> - }
tduffy> }
tduffy> evd_ptr = next_evd_ptr;
tduffy> }
tduffy> @@ -305,11 +297,10 @@ u32 dapl_ia_abrupt_close(DAPL_IA *ia_ptr
tduffy> atomic_dec(&ia_ptr->async_error_evd->evd_ref_count);
tduffy> dat_status = dapl_evd_free(ia_ptr->async_error_evd);
tduffy>
tduffy> - if (DAT_SUCCESS != dat_status) {
tduffy> + if (DAT_SUCCESS != dat_status)
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_WARN,
tduffy> "ia_close(ABRUPT): evd_free(%p) returns %x\n",
tduffy> ia_ptr->async_error_evd, dat_status);
tduffy> - }
tduffy>
tduffy> ia_ptr->async_error_evd = NULL;
tduffy> }
tduffy> @@ -337,13 +328,13 @@ u32 dapl_ia_abrupt_close(DAPL_IA *ia_ptr
tduffy> *
tduffy> */
tduffy>
tduffy> -u32 dapl_ia_graceful_close(DAPL_IA *ia_ptr)
tduffy> +u32 dapl_ia_graceful_close(struct dapl_ia *ia_ptr)
tduffy> {
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> u32 cur_dat_status;
tduffy> - DAPL_EVD *evd_ptr;
tduffy> - DAPL_LLIST_ENTRY *entry;
tduffy> - DAPL_HCA *hca_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> + struct dapl_llist_entry *entry;
tduffy> + struct dapl_hca *hca_ptr;
tduffy>
tduffy> if (!dapl_llist_is_empty(&ia_ptr->rmr_list_head) ||
tduffy> !dapl_llist_is_empty(&ia_ptr->rsp_list_head) ||
tduffy> @@ -416,14 +407,12 @@ u32 dapl_ia_graceful_close(DAPL_IA *ia_p
tduffy> if (ia_ptr->async_error_evd &&
tduffy> (TRUE == ia_ptr->cleanup_async_error_evd)) {
tduffy> cur_dat_status = dapl_ia_teardown_callbacks(ia_ptr);
tduffy> - if (DAT_SUCCESS != cur_dat_status) {
tduffy> + if (DAT_SUCCESS != cur_dat_status)
tduffy> dat_status = cur_dat_status;
tduffy> - }
tduffy> atomic_dec(&ia_ptr->async_error_evd->evd_ref_count);
tduffy> cur_dat_status = dapl_evd_free(ia_ptr->async_error_evd);
tduffy> - if (DAT_SUCCESS != cur_dat_status) {
tduffy> + if (DAT_SUCCESS != cur_dat_status)
tduffy> dat_status = cur_dat_status;
tduffy> - }
tduffy>
tduffy> ia_ptr->async_error_evd = NULL;
tduffy> }
tduffy> @@ -432,14 +421,14 @@ u32 dapl_ia_graceful_close(DAPL_IA *ia_p
tduffy>
tduffy> dapl_ia_free(ia_ptr);
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy>
tduffy> /*
tduffy> * free an IA INFO struct
tduffy> */
tduffy> -void dapl_ia_free(DAPL_IA * ia_ptr)
tduffy> +void dapl_ia_free(struct dapl_ia *ia_ptr)
tduffy> {
tduffy> dapl_os_assert(ia_ptr->header.magic == DAPL_MAGIC_IA);
tduffy>
tduffy> @@ -464,7 +453,7 @@ void dapl_ia_free(DAPL_IA * ia_ptr)
tduffy> /*
tduffy> * Add an ep to the IA structure
tduffy> */
tduffy> -void dapl_ia_link_ep(DAPL_IA * ia_ptr, DAPL_EP * ep_ptr)
tduffy> +void dapl_ia_link_ep(struct dapl_ia *ia_ptr, struct dapl_ep *ep_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_add_head(&ia_ptr->ep_list_head,
tduffy> @@ -475,7 +464,7 @@ void dapl_ia_link_ep(DAPL_IA * ia_ptr, D
tduffy> /*
tduffy> * Remove an ep from the ia info structure
tduffy> */
tduffy> -void dapl_ia_unlink_ep(DAPL_IA * ia_ptr, DAPL_EP * ep_ptr)
tduffy> +void dapl_ia_unlink_ep(struct dapl_ia *ia_ptr, struct dapl_ep *ep_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_remove_entry(&ia_ptr->ep_list_head,
tduffy> @@ -486,7 +475,7 @@ void dapl_ia_unlink_ep(DAPL_IA * ia_ptr,
tduffy> /*
tduffy> * Add an srq to the IA structure
tduffy> */
tduffy> -void dapl_ia_link_srq(DAPL_IA * ia_ptr, DAPL_SRQ * srq_ptr)
tduffy> +void dapl_ia_link_srq(struct dapl_ia *ia_ptr, struct dapl_srq *srq_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_add_head(&ia_ptr->srq_list_head,
tduffy> @@ -497,7 +486,7 @@ void dapl_ia_link_srq(DAPL_IA * ia_ptr,
tduffy> /*
tduffy> * Remove an srq from the ia info structure
tduffy> */
tduffy> -void dapl_ia_unlink_srq(DAPL_IA * ia_ptr, DAPL_SRQ * srq_ptr)
tduffy> +void dapl_ia_unlink_srq(struct dapl_ia *ia_ptr, struct dapl_srq *srq_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_remove_entry(&ia_ptr->srq_list_head,
tduffy> @@ -508,7 +497,7 @@ void dapl_ia_unlink_srq(DAPL_IA * ia_ptr
tduffy> /*
tduffy> * Add an lmr to the IA structure
tduffy> */
tduffy> -void dapl_ia_link_lmr(DAPL_IA * ia_ptr, DAPL_LMR * lmr_ptr)
tduffy> +void dapl_ia_link_lmr(struct dapl_ia *ia_ptr, struct dapl_lmr *lmr_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_add_head(&ia_ptr->lmr_list_head,
tduffy> @@ -519,7 +508,7 @@ void dapl_ia_link_lmr(DAPL_IA * ia_ptr,
tduffy> /*
tduffy> * Remove an lmr from the ia info structure
tduffy> */
tduffy> -void dapl_ia_unlink_lmr(DAPL_IA * ia_ptr, DAPL_LMR * lmr_ptr)
tduffy> +void dapl_ia_unlink_lmr(struct dapl_ia *ia_ptr, struct dapl_lmr *lmr_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_remove_entry(&ia_ptr->lmr_list_head,
tduffy> @@ -530,7 +519,7 @@ void dapl_ia_unlink_lmr(DAPL_IA * ia_ptr
tduffy> /*
tduffy> * Add an rmr to the IA structure
tduffy> */
tduffy> -void dapl_ia_link_rmr(DAPL_IA * ia_ptr, DAPL_RMR * rmr_ptr)
tduffy> +void dapl_ia_link_rmr(struct dapl_ia *ia_ptr, struct dapl_rmr *rmr_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_add_head(&ia_ptr->rmr_list_head,
tduffy> @@ -541,7 +530,7 @@ void dapl_ia_link_rmr(DAPL_IA * ia_ptr,
tduffy> /*
tduffy> * Remove an rmr from the ia info structure
tduffy> */
tduffy> -void dapl_ia_unlink_rmr(DAPL_IA * ia_ptr, DAPL_RMR * rmr_ptr)
tduffy> +void dapl_ia_unlink_rmr(struct dapl_ia *ia_ptr, struct dapl_rmr *rmr_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_remove_entry(&ia_ptr->rmr_list_head,
tduffy> @@ -552,7 +541,7 @@ void dapl_ia_unlink_rmr(DAPL_IA * ia_ptr
tduffy> /*
tduffy> * Add an pz to the IA structure
tduffy> */
tduffy> -void dapl_ia_link_pz(DAPL_IA * ia_ptr, DAPL_PZ * pz_ptr)
tduffy> +void dapl_ia_link_pz(struct dapl_ia *ia_ptr, struct dapl_pz *pz_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_add_head(&ia_ptr->pz_list_head,
tduffy> @@ -563,7 +552,7 @@ void dapl_ia_link_pz(DAPL_IA * ia_ptr, D
tduffy> /*
tduffy> * Remove an pz from the ia info structure
tduffy> */
tduffy> -void dapl_ia_unlink_pz(DAPL_IA * ia_ptr, DAPL_PZ * pz_ptr)
tduffy> +void dapl_ia_unlink_pz(struct dapl_ia *ia_ptr, struct dapl_pz *pz_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_remove_entry(&ia_ptr->pz_list_head,
tduffy> @@ -574,7 +563,7 @@ void dapl_ia_unlink_pz(DAPL_IA * ia_ptr,
tduffy> /*
tduffy> * Add an evd to the IA structure
tduffy> */
tduffy> -void dapl_ia_link_evd(DAPL_IA * ia_ptr, DAPL_EVD * evd_ptr)
tduffy> +void dapl_ia_link_evd(struct dapl_ia *ia_ptr, struct dapl_evd *evd_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_add_head(&ia_ptr->evd_list_head,
tduffy> @@ -585,7 +574,7 @@ void dapl_ia_link_evd(DAPL_IA * ia_ptr,
tduffy> /*
tduffy> * Remove an evd from the ia info structure
tduffy> */
tduffy> -void dapl_ia_unlink_evd(DAPL_IA * ia_ptr, DAPL_EVD * evd_ptr)
tduffy> +void dapl_ia_unlink_evd(struct dapl_ia *ia_ptr, struct dapl_evd *evd_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_remove_entry(&ia_ptr->evd_list_head,
tduffy> @@ -596,7 +585,7 @@ void dapl_ia_unlink_evd(DAPL_IA * ia_ptr
tduffy> /*
tduffy> * Add an psp to the IA structure
tduffy> */
tduffy> -void dapl_ia_link_psp(DAPL_IA * ia_ptr, DAPL_SP * sp_ptr)
tduffy> +void dapl_ia_link_psp(struct dapl_ia *ia_ptr, struct dapl_sp *sp_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_add_head(&ia_ptr->psp_list_head,
tduffy> @@ -607,9 +596,9 @@ void dapl_ia_link_psp(DAPL_IA * ia_ptr,
tduffy> /*
tduffy> * Remove an sp from the appropriate ia rsp or psp queue
tduffy> */
tduffy> -void dapl_ia_unlink_sp(DAPL_IA * ia_ptr, DAPL_SP * sp_ptr)
tduffy> +void dapl_ia_unlink_sp(struct dapl_ia *ia_ptr, struct dapl_sp *sp_ptr)
tduffy> {
tduffy> - DAPL_LLIST_HEAD *list_head;
tduffy> + struct dapl_llist_entry **list_head;
tduffy>
tduffy> if (sp_ptr->header.handle_type == DAT_HANDLE_TYPE_PSP) {
tduffy> list_head = &ia_ptr->psp_list_head;
tduffy> @@ -640,17 +629,16 @@ void dapl_ia_unlink_sp(DAPL_IA * ia_ptr,
tduffy> * none
tduffy> *
tduffy> */
tduffy> -DAPL_SP *dapl_ia_sp_search(DAPL_IA * ia_ptr,
tduffy> - DAT_CONN_QUAL conn_qual, boolean_t is_psp)
tduffy> +struct dapl_sp *dapl_ia_sp_search(struct dapl_ia *ia_ptr,
tduffy> + DAT_CONN_QUAL conn_qual, boolean_t is_psp)
tduffy> {
tduffy> - DAPL_SP *sp_ptr;
tduffy> - DAPL_LLIST_HEAD *list_head;
tduffy> + struct dapl_sp *sp_ptr;
tduffy> + struct dapl_llist_entry **list_head;
tduffy>
tduffy> - if (is_psp) {
tduffy> + if (is_psp)
tduffy> list_head = &ia_ptr->psp_list_head;
tduffy> - } else {
tduffy> + else
tduffy> list_head = &ia_ptr->rsp_list_head;
tduffy> - }
tduffy>
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy>
tduffy> @@ -686,7 +674,7 @@ DAPL_SP *dapl_ia_sp_search(DAPL_IA * ia_
tduffy> * none
tduffy> *
tduffy> */
tduffy> -void dapl_ia_link_rsp(DAPL_IA * ia_ptr, DAPL_SP * sp_ptr)
tduffy> +void dapl_ia_link_rsp(struct dapl_ia *ia_ptr, struct dapl_sp *sp_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> dapl_llist_add_head(&ia_ptr->rsp_list_head,
tduffy> @@ -694,7 +682,8 @@ void dapl_ia_link_rsp(DAPL_IA * ia_ptr,
tduffy> spin_unlock_irqrestore(&ia_ptr->header.lock, ia_ptr->header.flags);
tduffy> }
tduffy>
tduffy> -u32 dapl_ia_setup_callbacks(DAPL_IA * ia_ptr, DAPL_EVD * async_evd_ptr)
tduffy> +u32 dapl_ia_setup_callbacks(struct dapl_ia *ia_ptr,
tduffy> + struct dapl_evd *async_evd_ptr)
tduffy> {
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> @@ -717,7 +706,7 @@ u32 dapl_ia_setup_callbacks(DAPL_IA * ia
tduffy> return dat_status;
tduffy> }
tduffy>
tduffy> -u32 dapl_ia_teardown_callbacks(DAPL_IA * ia_ptr)
tduffy> +u32 dapl_ia_teardown_callbacks(struct dapl_ia *ia_ptr)
tduffy> {
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_pz_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_pz_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_pz_util.c (working copy)
tduffy> @@ -52,13 +52,13 @@
tduffy> * none
tduffy> *
tduffy> */
tduffy> -DAPL_PZ *dapl_pz_alloc(DAPL_IA * ia)
tduffy> +struct dapl_pz *dapl_pz_alloc(struct dapl_ia *ia)
tduffy> {
tduffy> - DAPL_PZ *pz;
tduffy> + struct dapl_pz *pz;
tduffy>
tduffy> /* Allocate PZ */
tduffy> pz = kmalloc(sizeof *pz, GFP_ATOMIC);
tduffy> - if (!pz)
tduffy> + if (!pz)
tduffy> return NULL;
tduffy>
tduffy> /* zero the structure */
tduffy> @@ -100,9 +100,10 @@ DAPL_PZ *dapl_pz_alloc(DAPL_IA * ia)
tduffy> * none
tduffy> *
tduffy> */
tduffy> -void dapl_pz_dealloc(DAPL_PZ * pz)
tduffy> +void dapl_pz_dealloc(struct dapl_pz *pz)
tduffy> {
tduffy> - pz->header.magic = DAPL_MAGIC_INVALID; /* reset magic to prevent reuse */
tduffy> + /* reset magic to prevent reuse */
tduffy> + pz->header.magic = DAPL_MAGIC_INVALID;
tduffy> dapl_ia_unlink_pz(pz->header.owner_ia, pz);
tduffy> /* no need to destroy pz->header.lock */
tduffy>
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_query.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_query.c (working copy)
tduffy> @@ -59,14 +59,14 @@
tduffy> */
tduffy> u32 dapl_ep_query(DAT_EP_HANDLE ep_handle, struct dat_ep_param *ep_param)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> u32 status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> "dapl_ep_query (%p, %p)\n",
tduffy> ep_handle, ep_param);
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy>
tduffy> /*
tduffy> * Verify parameter & state
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_pz_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_pz_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_pz_util.h (working copy)
tduffy> @@ -39,8 +39,8 @@
tduffy>
tduffy> #include "dapl.h"
tduffy>
tduffy> -extern DAPL_PZ *dapl_pz_alloc(DAPL_IA * ia);
tduffy> +extern struct dapl_pz *dapl_pz_alloc(struct dapl_ia *ia);
tduffy>
tduffy> -extern void dapl_pz_dealloc(DAPL_PZ * pz);
tduffy> +extern void dapl_pz_dealloc(struct dapl_pz *pz);
tduffy>
tduffy> -#endif /* DAPL_PZ_UTIL_H */
tduffy> +#endif /* DAPL_PZ_UTIL_H */
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_dequeue.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_dequeue.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_dequeue.c (working copy)
tduffy> @@ -64,14 +64,14 @@
tduffy>
tduffy> u32 dapl_evd_dequeue(DAT_EVD_HANDLE evd_handle, struct dat_event *event)
tduffy> {
tduffy> - DAPL_EVD *evd_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> struct dat_event *local_event;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> "dapl_evd_dequeue (%p, %p)\n", evd_handle, event);
tduffy>
tduffy> - evd_ptr = (DAPL_EVD *) evd_handle;
tduffy> + evd_ptr = (struct dapl_evd *)evd_handle;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(evd_handle, DAPL_MAGIC_EVD)) {
tduffy> dat_status = DAT_ERROR(DAT_INVALID_HANDLE, 0);
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_openib_cm.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_openib_cm.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_openib_cm.c (working copy)
tduffy> @@ -399,12 +399,12 @@ u32 dapl_ib_connect(DAT_EP_HANDLE ep_han
tduffy> DAT_CONN_QUAL remote_conn_qual,
tduffy> int private_data_size, void *private_data)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> struct dapl_cm_id *conn;
tduffy> int status;
tduffy>
tduffy> - ep_ptr = (DAPL_EP *)ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy> if (ep_ptr->qp_handle == NULL) {
tduffy> printk(KERN_ERR "dapl_ib_connect: qp handle invalid\n");
tduffy> return DAT_INTERNAL_ERROR;
tduffy> @@ -486,7 +486,7 @@ u32 dapl_ib_connect(DAT_EP_HANDLE ep_han
tduffy> * DAT_INVALID_PARAMETER
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_disconnect(DAPL_EP *ep_ptr, enum dat_close_flags close_flags)
tduffy> +u32 dapl_ib_disconnect(struct dapl_ep *ep_ptr, enum dat_close_flags close_flags)
tduffy> {
tduffy> struct dapl_cm_id *conn = ep_ptr->cm_handle;
tduffy> int status;
tduffy> @@ -510,24 +510,24 @@ u32 dapl_ib_disconnect(DAPL_EP *ep_ptr,
tduffy> return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> -/*
tduffy> - * dapl_ib_disconnect_clean
tduffy> - *
tduffy> - * Clean up outstanding connection data. This routine is invoked
tduffy> +/*
tduffy> + * dapl_ib_disconnect_clean
tduffy> + *
tduffy> + * Clean up outstanding connection data. This routine is invoked
tduffy> * after the final disconnect callback has occurred.
tduffy> - *
tduffy> - * Input:
tduffy> - * ep_ptr DAPL_EP
tduffy> - * active Indicates active side of connection
tduffy> - *
tduffy> - * Output:
tduffy> - * none
tduffy> - *
tduffy> - * Returns:
tduffy> - * void
tduffy> - *
tduffy> + *
tduffy> + * Input:
tduffy> + * ep_ptr struct dapl_ep
tduffy> + * active Indicates active side of connection
tduffy> + *
tduffy> + * Output:
tduffy> + * none
tduffy> + *
tduffy> + * Returns:
tduffy> + * void
tduffy> + *
tduffy> */
tduffy> -void dapl_ib_disconnect_clean(DAPL_EP * ep_ptr, boolean_t active)
tduffy> +void dapl_ib_disconnect_clean(struct dapl_ep *ep_ptr, boolean_t active)
tduffy> {
tduffy> int status;
tduffy>
tduffy> @@ -566,9 +566,9 @@ void dapl_ib_disconnect_clean(DAPL_EP *
tduffy> * void
tduffy> *
tduffy> */
tduffy> -void dapl_ib_reinit_ep(DAPL_EP * ep_ptr)
tduffy> +void dapl_ib_reinit_ep(struct dapl_ep *ep_ptr)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> int ib_status;
tduffy>
tduffy> ia_ptr = ep_ptr->header.owner_ia;
tduffy> @@ -615,7 +615,8 @@ void dapl_ib_reinit_ep(DAPL_EP * ep_ptr)
tduffy> * DAT_INVALID_PARAMETER
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_setup_conn_listener(DAPL_IA *ia_ptr, u64 ServiceID, DAPL_SP *sp_ptr)
tduffy> +u32 dapl_ib_setup_conn_listener(struct dapl_ia *ia_ptr, u64 ServiceID,
tduffy> + struct dapl_sp *sp_ptr)
tduffy> {
tduffy> int status;
tduffy>
tduffy> @@ -658,7 +659,7 @@ u32 dapl_ib_setup_conn_listener(DAPL_IA
tduffy> * DAT_INVALID_PARAMETER
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_remove_conn_listener(DAPL_IA *ia_ptr, DAPL_SP *sp_ptr)
tduffy> +u32 dapl_ib_remove_conn_listener(struct dapl_ia *ia_ptr, struct dapl_sp *sp_ptr)
tduffy> {
tduffy> //*** This will hang if called from CM thread context...
tduffy> //*** Move back to using WQ...
tduffy> @@ -731,16 +732,16 @@ u32 dapl_ib_accept_connection(DAT_CR_HAN
tduffy> int private_data_size,
tduffy> const void *prd_ptr)
tduffy> {
tduffy> - DAPL_CR *cr_ptr;
tduffy> - DAPL_EP *ep_ptr;
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_cr *cr_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> u32 dat_status;
tduffy> int status;
tduffy> struct ib_cm_rep_param passive_params;
tduffy> struct dapl_cm_id *conn;
tduffy>
tduffy> - cr_ptr = (DAPL_CR *) cr_handle;
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + cr_ptr = (struct dapl_cr *)cr_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy> ia_ptr = ep_ptr->header.owner_ia;
tduffy> conn = cr_ptr->ib_cm_handle;
tduffy>
tduffy> @@ -833,13 +834,13 @@ static int ib_cm_get_remote_gid(struct d
tduffy> u32 dapl_ib_cm_remote_addr(DAT_HANDLE dat_handle,
tduffy> struct sockaddr_in6 *remote_ia_address)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> int rc;
tduffy> union ib_gid remote_gid;
tduffy>
tduffy> - DAPL_CR *cr_ptr = (DAPL_CR *) dat_handle;
tduffy> + struct dapl_cr *cr_ptr = (struct dapl_cr *)dat_handle;
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) cr_ptr->sp_ptr->ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)cr_ptr->sp_ptr->ia_handle;
tduffy>
tduffy> rc = ib_cm_get_remote_gid(cr_ptr->ib_cm_handle, (u8 *) & remote_gid);
tduffy> if (rc < 0)
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ia_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ia_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ia_util.h (working copy)
tduffy> @@ -39,49 +39,51 @@
tduffy>
tduffy> #include "dapl.h"
tduffy>
tduffy> -DAPL_IA *dapl_ia_alloc(struct dat_provider *provider, DAPL_HCA * hca_ptr);
tduffy> +struct dapl_ia *dapl_ia_alloc(struct dat_provider *provider,
tduffy> + struct dapl_hca *hca_ptr);
tduffy>
tduffy> -u32 dapl_ia_abrupt_close(DAPL_IA *ia_ptr);
tduffy> +u32 dapl_ia_abrupt_close(struct dapl_ia *ia_ptr);
tduffy>
tduffy> -u32 dapl_ia_graceful_close(DAPL_IA *ia_ptr);
tduffy> +u32 dapl_ia_graceful_close(struct dapl_ia *ia_ptr);
tduffy>
tduffy> -void dapl_ia_free(DAPL_IA * ia_ptr);
tduffy> +void dapl_ia_free(struct dapl_ia *ia_ptr);
tduffy>
tduffy> -void dapl_ia_link_ep(DAPL_IA * ia_ptr, DAPL_EP * ep_info);
tduffy> +void dapl_ia_link_ep(struct dapl_ia *ia_ptr, struct dapl_ep *ep_info);
tduffy>
tduffy> -void dapl_ia_unlink_ep(DAPL_IA * ia_ptr, DAPL_EP * ep_info);
tduffy> +void dapl_ia_unlink_ep(struct dapl_ia *ia_ptr, struct dapl_ep *ep_info);
tduffy>
tduffy> -void dapl_ia_link_srq(DAPL_IA * ia_ptr, DAPL_SRQ * srq_ptr);
tduffy> +void dapl_ia_link_srq(struct dapl_ia *ia_ptr, struct dapl_srq *srq_ptr);
tduffy>
tduffy> -void dapl_ia_unlink_srq(DAPL_IA * ia_ptr, DAPL_SRQ * srq_ptr);
tduffy> +void dapl_ia_unlink_srq(struct dapl_ia *ia_ptr, struct dapl_srq *srq_ptr);
tduffy>
tduffy> -void dapl_ia_link_lmr(DAPL_IA * ia_ptr, DAPL_LMR * lmr_info);
tduffy> +void dapl_ia_link_lmr(struct dapl_ia *ia_ptr, struct dapl_lmr *lmr_info);
tduffy>
tduffy> -void dapl_ia_unlink_lmr(DAPL_IA * ia_ptr, DAPL_LMR * lmr_info);
tduffy> +void dapl_ia_unlink_lmr(struct dapl_ia *ia_ptr, struct dapl_lmr *lmr_info);
tduffy>
tduffy> -void dapl_ia_link_rmr(DAPL_IA * ia_ptr, DAPL_RMR * rmr_info);
tduffy> +void dapl_ia_link_rmr(struct dapl_ia *ia_ptr, struct dapl_rmr *rmr_info);
tduffy>
tduffy> -void dapl_ia_unlink_rmr(DAPL_IA * ia_ptr, DAPL_RMR * rmr_info);
tduffy> +void dapl_ia_unlink_rmr(struct dapl_ia *ia_ptr, struct dapl_rmr *rmr_info);
tduffy>
tduffy> -void dapl_ia_link_pz(DAPL_IA * ia_ptr, DAPL_PZ * pz_info);
tduffy> +void dapl_ia_link_pz(struct dapl_ia *ia_ptr, struct dapl_pz *pz_info);
tduffy>
tduffy> -void dapl_ia_unlink_pz(DAPL_IA * ia_ptr, DAPL_PZ * pz_info);
tduffy> +void dapl_ia_unlink_pz(struct dapl_ia *ia_ptr, struct dapl_pz *pz_info);
tduffy>
tduffy> -void dapl_ia_link_evd(DAPL_IA * ia_ptr, DAPL_EVD * evd_info);
tduffy> +void dapl_ia_link_evd(struct dapl_ia *ia_ptr, struct dapl_evd *evd_info);
tduffy>
tduffy> -void dapl_ia_unlink_evd(DAPL_IA * ia_ptr, DAPL_EVD * evd_info);
tduffy> +void dapl_ia_unlink_evd(struct dapl_ia *ia_ptr, struct dapl_evd *evd_info);
tduffy>
tduffy> -void dapl_ia_link_psp(DAPL_IA * ia_ptr, DAPL_SP * sp_info);
tduffy> +void dapl_ia_link_psp(struct dapl_ia *ia_ptr, struct dapl_sp *sp_info);
tduffy>
tduffy> -void dapl_ia_unlink_sp(DAPL_IA * ia_ptr, DAPL_SP * sp_info);
tduffy> +void dapl_ia_unlink_sp(struct dapl_ia *ia_ptr, struct dapl_sp *sp_info);
tduffy>
tduffy> -void dapl_ia_link_rsp(DAPL_IA * ia_ptr, DAPL_SP * sp_info);
tduffy> +void dapl_ia_link_rsp(struct dapl_ia *ia_ptr, struct dapl_sp *sp_info);
tduffy>
tduffy> -DAPL_SP *dapl_ia_sp_search(DAPL_IA * ia_ptr,
tduffy> +struct dapl_sp *dapl_ia_sp_search(struct dapl_ia *ia_ptr,
tduffy> DAT_CONN_QUAL conn_qual, boolean_t is_psp);
tduffy>
tduffy> -u32 dapl_ia_setup_callbacks(DAPL_IA *ia_ptr, DAPL_EVD *async_evd_ptr);
tduffy> +u32 dapl_ia_setup_callbacks(struct dapl_ia *ia_ptr,
tduffy> + struct dapl_evd *async_evd_ptr);
tduffy>
tduffy> -u32 dapl_ia_teardown_callbacks(DAPL_IA *ia_ptr);
tduffy> +u32 dapl_ia_teardown_callbacks(struct dapl_ia *ia_ptr);
tduffy>
tduffy> #endif
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_rmr_bind.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_rmr_bind.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_rmr_bind.c (working copy)
tduffy> @@ -46,16 +46,16 @@
tduffy> * *
tduffy> *********************************************************************/
tduffy>
tduffy> -static inline u32 dapl_rmr_bind_fuse(DAPL_RMR *rmr,
tduffy> +static inline u32 dapl_rmr_bind_fuse(struct dapl_rmr *rmr,
tduffy> const struct dat_lmr_triplet *lmr_triplet,
tduffy> enum dat_mem_priv_flags mem_priv,
tduffy> - DAPL_EP *ep_ptr,
tduffy> + struct dapl_ep *ep_ptr,
tduffy> DAT_RMR_COOKIE user_cookie,
tduffy> enum dat_completion_flags completion_flags,
tduffy> DAT_RMR_CONTEXT *rmr_context)
tduffy> {
tduffy> - DAPL_LMR *lmr;
tduffy> - DAPL_COOKIE *cookie;
tduffy> + struct dapl_lmr *lmr;
tduffy> + struct dapl_cookie *cookie;
tduffy> u32 status;
tduffy> boolean_t is_signaled;
tduffy>
tduffy> @@ -152,15 +152,16 @@ static inline u32 dapl_rmr_bind_fuse(DAP
tduffy> if (NULL != rmr_context)
tduffy> *rmr_context = rmr->param.rmr_context;
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return status;
tduffy> }
tduffy>
tduffy> -static inline u32 dapl_rmr_bind_unfuse(DAPL_RMR *rmr, DAPL_EP *ep_ptr,
tduffy> +static inline u32 dapl_rmr_bind_unfuse(struct dapl_rmr *rmr,
tduffy> + struct dapl_ep *ep_ptr,
tduffy> DAT_RMR_COOKIE user_cookie,
tduffy> enum dat_completion_flags cflags)
tduffy> {
tduffy> - DAPL_COOKIE *cookie;
tduffy> + struct dapl_cookie *cookie;
tduffy> u32 status = DAT_SUCCESS;
tduffy> boolean_t is_signaled;
tduffy>
tduffy> @@ -232,7 +233,7 @@ static inline u32 dapl_rmr_bind_unfuse(D
tduffy> rmr->ep = ep_ptr;
tduffy> rmr->lmr = NULL;
tduffy>
tduffy> - bail1:
tduffy> +bail1:
tduffy> return status;
tduffy> }
tduffy>
tduffy> @@ -254,8 +255,8 @@ u32 dapl_rmr_bind(DAT_RMR_HANDLE rmr_han
tduffy> enum dat_completion_flags completion_flags,
tduffy> DAT_RMR_CONTEXT *rmr_context)
tduffy> {
tduffy> - DAPL_RMR *rmr;
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_rmr *rmr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(rmr_handle, DAPL_MAGIC_RMR))
tduffy> return DAT_ERROR(DAT_INVALID_HANDLE, DAT_INVALID_HANDLE_RMR);
tduffy> @@ -263,16 +264,15 @@ u32 dapl_rmr_bind(DAT_RMR_HANDLE rmr_han
tduffy> if (DAPL_BAD_HANDLE(ep_handle, DAPL_MAGIC_EP))
tduffy> return DAT_ERROR(DAT_INVALID_HANDLE, DAT_INVALID_HANDLE_EP);
tduffy>
tduffy> - rmr = (DAPL_RMR *) rmr_handle;
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + rmr = (struct dapl_rmr *)rmr_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy>
tduffy> /* if the rmr should be bound */
tduffy> - if (0 != lmr_triplet->segment_length) {
tduffy> + if (0 != lmr_triplet->segment_length)
tduffy> return dapl_rmr_bind_fuse(rmr, lmr_triplet, mem_priv, ep_ptr,
tduffy> user_cookie, completion_flags,
tduffy> rmr_context);
tduffy> - } else { /* the rmr should be unbound */
tduffy> + else /* the rmr should be unbound */
tduffy> return dapl_rmr_bind_unfuse(rmr, ep_ptr, user_cookie,
tduffy> completion_flags);
tduffy> - }
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_cr_reject.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_cr_reject.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_cr_reject.c (working copy)
tduffy> @@ -42,11 +42,11 @@
tduffy> */
tduffy> u32 dapl_cr_reject(DAT_CR_HANDLE cr_handle)
tduffy> {
tduffy> - DAPL_CR *cr_ptr;
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_cr *cr_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> enum dat_ep_state entry_ep_state;
tduffy> DAT_EP_HANDLE entry_ep_handle;
tduffy> - DAPL_SP *sp_ptr;
tduffy> + struct dapl_sp *sp_ptr;
tduffy> u32 dat_status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_cr_reject (%p)\n", cr_handle);
tduffy> @@ -57,16 +57,16 @@ u32 dapl_cr_reject(DAT_CR_HANDLE cr_hand
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - cr_ptr = (DAPL_CR *) cr_handle;
tduffy> + cr_ptr = (struct dapl_cr *)cr_handle;
tduffy>
tduffy> /*
tduffy> * Clean up provider created EP if there is one: only if
tduffy> * DAT_PSP_PROVIDER_FLAG was set on the PSP
tduffy> */
tduffy> - ep_ptr = (DAPL_EP *) cr_ptr->param.local_ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)cr_ptr->param.local_ep_handle;
tduffy> entry_ep_handle = cr_ptr->param.local_ep_handle;
tduffy> entry_ep_state = 0;
tduffy> - if (ep_ptr != NULL) {
tduffy> + if (ep_ptr) {
tduffy> entry_ep_state = ep_ptr->param.ep_state;
tduffy> ep_ptr->param.ep_state = DAT_EP_STATE_UNCONNECTED;
tduffy> cr_ptr->param.local_ep_handle = NULL;
tduffy> @@ -87,10 +87,8 @@ u32 dapl_cr_reject(DAT_CR_HANDLE cr_hand
tduffy> * RSP and user-provided EPs are in the control of the user.
tduffy> */
tduffy> sp_ptr = cr_ptr->sp_ptr;
tduffy> - if (ep_ptr != NULL &&
tduffy> - sp_ptr->psp_flags == DAT_PSP_PROVIDER_FLAG) {
tduffy> + if (ep_ptr && sp_ptr->psp_flags == DAT_PSP_PROVIDER_FLAG)
tduffy> (void)dapl_ep_free(ep_ptr);
tduffy> - }
tduffy>
tduffy> /* Remove the CR from the queue, then free it */
tduffy> spin_lock_irqsave(&sp_ptr->header.lock, sp_ptr->header.flags);
tduffy> @@ -101,6 +99,6 @@ u32 dapl_cr_reject(DAT_CR_HANDLE cr_hand
tduffy> dapl_cr_free(cr_ptr);
tduffy> }
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_reset.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_reset.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_reset.c (working copy)
tduffy> @@ -63,10 +63,10 @@
tduffy> */
tduffy> u32 dapl_ep_reset(DAT_EP_HANDLE ep_handle)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy>
tduffy> /*
tduffy> * Verify parameter & state
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_recv_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_recv_query.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_recv_query.c (working copy)
tduffy> @@ -57,13 +57,13 @@
tduffy> u32 dapl_ep_recv_query(DAT_EP_HANDLE ep_handle,
tduffy> int *nbufs_allocate, int *bufs_alloc_span)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_ep_recv_query (%p, %p, %p)\n",
tduffy> ep_handle, nbufs_allocate, bufs_alloc_span);
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy>
tduffy> /*
tduffy> * Verify parameter & state
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_openib_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_openib_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_openib_util.c (working copy)
tduffy> @@ -159,7 +159,7 @@ static inline int dapl_ib_convert_mem_pr
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_open_hca(char *name, DAPL_HCA * hca_ptr)
tduffy> +u32 dapl_ib_open_hca(char *name, struct dapl_hca *hca_ptr)
tduffy> {
tduffy> u32 dat_ret;
tduffy>
tduffy> @@ -196,7 +196,7 @@ u32 dapl_ib_open_hca(char *name, DAPL_HC
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_close_hca(DAPL_HCA *hca_ptr)
tduffy> +u32 dapl_ib_close_hca(struct dapl_hca *hca_ptr)
tduffy> {
tduffy> return DAT_SUCCESS;
tduffy> }
tduffy> @@ -219,8 +219,8 @@ u32 dapl_ib_close_hca(DAPL_HCA *hca_ptr)
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_cq_alloc(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr, int *cqlen,
tduffy> - ib_comp_handler callback)
tduffy> +u32 dapl_ib_cq_alloc(struct dapl_ia *ia_ptr, struct dapl_evd *evd_ptr,
tduffy> + int *cqlen, ib_comp_handler callback)
tduffy> {
tduffy> int ib_status;
tduffy>
tduffy> @@ -253,7 +253,7 @@ u32 dapl_ib_cq_alloc(DAPL_IA *ia_ptr, DA
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_cq_free(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr)
tduffy> +u32 dapl_ib_cq_free(struct dapl_ia *ia_ptr, struct dapl_evd *evd_ptr)
tduffy> {
tduffy> int ib_status;
tduffy>
tduffy> @@ -261,7 +261,8 @@ u32 dapl_ib_cq_free(DAPL_IA *ia_ptr, DAP
tduffy> return dapl_ib_status_convert(ib_status);
tduffy> }
tduffy>
tduffy> -u32 dapl_ib_cq_resize(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr, int *cqlen)
tduffy> +u32 dapl_ib_cq_resize(struct dapl_ia *ia_ptr, struct dapl_evd *evd_ptr,
tduffy> + int *cqlen)
tduffy> {
tduffy> int ib_status;
tduffy>
tduffy> @@ -293,7 +294,7 @@ u32 dapl_ib_cq_resize(DAPL_IA *ia_ptr, D
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_set_cq_notify(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr)
tduffy> +u32 dapl_set_cq_notify(struct dapl_ia *ia_ptr, struct dapl_evd *evd_ptr)
tduffy> {
tduffy> int ib_status;
tduffy>
tduffy> @@ -318,7 +319,7 @@ u32 dapl_set_cq_notify(DAPL_IA *ia_ptr,
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_pd_alloc(DAPL_IA *ia, DAPL_PZ *pz)
tduffy> +u32 dapl_ib_pd_alloc(struct dapl_ia *ia, struct dapl_pz *pz)
tduffy> {
tduffy> struct ib_pd *pd;
tduffy> int ib_status;
tduffy> @@ -353,7 +354,7 @@ u32 dapl_ib_pd_alloc(DAPL_IA *ia, DAPL_P
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_pd_free(DAPL_PZ *pz)
tduffy> +u32 dapl_ib_pd_free(struct dapl_pz *pz)
tduffy> {
tduffy> int ib_status;
tduffy>
tduffy> @@ -388,14 +389,15 @@ u32 dapl_ib_pd_free(DAPL_PZ *pz)
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_mr_register(DAPL_IA *ia, DAPL_LMR *lmr, void *virt_addr,
tduffy> - u64 length, enum dat_mem_priv_flags privileges)
tduffy> +u32 dapl_ib_mr_register(struct dapl_ia *ia, struct dapl_lmr *lmr,
tduffy> + void *virt_addr, u64 length,
tduffy> + enum dat_mem_priv_flags privileges)
tduffy> {
tduffy> /* ITBD virtual memory registration ??? */
tduffy> return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> -u32 dapl_ib_mr_register_physical(DAPL_IA *ia_ptr, DAPL_LMR *lmr,
tduffy> +u32 dapl_ib_mr_register_physical(struct dapl_ia *ia_ptr, struct dapl_lmr *lmr,
tduffy> void *phys_addr, u64 length,
tduffy> enum dat_mem_priv_flags privileges)
tduffy> {
tduffy> @@ -421,7 +423,7 @@ u32 dapl_ib_mr_register_physical(DAPL_IA
tduffy> iova = buf_list[0].addr;
tduffy> acl = dapl_ib_convert_mem_privileges(privileges);
tduffy> acl |= IB_ACCESS_MW_BIND;
tduffy> - mr = ib_reg_phys_mr((struct ib_pd *)((DAPL_PZ *) lmr->param.pz_handle)->
tduffy> + mr = ib_reg_phys_mr((struct ib_pd *)((struct dapl_pz *)lmr->param.pz_handle)->
tduffy> pd_handle, buf_list, length, acl, &iova);
tduffy> kfree(buf_list);
tduffy> if (IS_ERR(mr)) {
tduffy> @@ -469,7 +471,7 @@ u32 dapl_ib_mr_register_physical(DAPL_IA
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_mr_deregister(DAPL_LMR *lmr)
tduffy> +u32 dapl_ib_mr_deregister(struct dapl_lmr *lmr)
tduffy> {
tduffy> int ib_status;
tduffy>
tduffy> @@ -503,12 +505,12 @@ u32 dapl_ib_mr_deregister(DAPL_LMR *lmr)
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_mw_alloc(DAPL_RMR *rmr)
tduffy> +u32 dapl_ib_mw_alloc(struct dapl_rmr *rmr)
tduffy> {
tduffy> int ib_status;
tduffy> struct ib_mw *mw;
tduffy>
tduffy> - mw = ib_alloc_mw((struct ib_pd *)((DAPL_PZ *) rmr->param.pz_handle)->
tduffy> + mw = ib_alloc_mw((struct ib_pd *)((struct dapl_pz *)rmr->param.pz_handle)->
tduffy> pd_handle);
tduffy> if (IS_ERR(mw)) {
tduffy> ib_status = PTR_ERR(mw);
tduffy> @@ -540,7 +542,7 @@ u32 dapl_ib_mw_alloc(DAPL_RMR *rmr)
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_mw_free(DAPL_RMR *rmr)
tduffy> +u32 dapl_ib_mw_free(struct dapl_rmr *rmr)
tduffy> {
tduffy> int ib_status;
tduffy>
tduffy> @@ -573,10 +575,10 @@ u32 dapl_ib_mw_free(DAPL_RMR *rmr)
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_mw_bind(DAPL_RMR *rmr, DAPL_LMR *lmr, DAPL_EP *ep,
tduffy> - DAPL_COOKIE *cookie, u64 virtual_address,
tduffy> - u64 length, enum dat_mem_priv_flags mem_priv,
tduffy> - boolean_t is_signaled)
tduffy> +u32 dapl_ib_mw_bind(struct dapl_rmr *rmr, struct dapl_lmr *lmr,
tduffy> + struct dapl_ep *ep, struct dapl_cookie *cookie,
tduffy> + u64 virtual_address, u64 length,
tduffy> + enum dat_mem_priv_flags mem_priv, boolean_t is_signaled)
tduffy> {
tduffy> int ib_status;
tduffy> struct ib_mw_bind mw_bind_prop;
tduffy> @@ -624,8 +626,8 @@ u32 dapl_ib_mw_bind(DAPL_RMR *rmr, DAPL_
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_mw_unbind(DAPL_RMR *rmr, DAPL_EP *ep, DAPL_COOKIE *cookie,
tduffy> - boolean_t is_signaled)
tduffy> +u32 dapl_ib_mw_unbind(struct dapl_rmr *rmr, struct dapl_ep *ep,
tduffy> + struct dapl_cookie *cookie, boolean_t is_signaled)
tduffy> {
tduffy> int ib_status;
tduffy> struct ib_mw_bind mw_bind_prop;
tduffy> @@ -671,7 +673,7 @@ u32 dapl_ib_mw_unbind(DAPL_RMR *rmr, DAP
tduffy> * DAT_INVALID_PARAMETER
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_setup_async_callback(DAPL_IA *ia_ptr,
tduffy> +u32 dapl_ib_setup_async_callback(struct dapl_ia *ia_ptr,
tduffy> DAPL_ASYNC_HANDLER_TYPE handler_type,
tduffy> ib_async_handler_t callback, void *context)
tduffy> {
tduffy> @@ -696,7 +698,7 @@ u32 dapl_ib_setup_async_callback(DAPL_IA
tduffy> * DAT_SUCCESS
tduffy> * DAT_INVALID_PARAMETER
tduffy> */
tduffy> -u32 dapl_ib_query_hca(DAPL_HCA *hca_ptr, struct dat_ia_attr *ia_attr,
tduffy> +u32 dapl_ib_query_hca(struct dapl_hca *hca_ptr, struct dat_ia_attr *ia_attr,
tduffy> struct dat_ep_attr *ep_attr, struct sockaddr_in6 *ip_addr)
tduffy> {
tduffy> int ib_status;
tduffy> @@ -797,7 +799,7 @@ u32 dapl_ib_query_hca(DAPL_HCA *hca_ptr,
tduffy> return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> -u32 dapl_ib_completion_poll(DAPL_HCA *hca_ptr, DAPL_EVD *evd_ptr,
tduffy> +u32 dapl_ib_completion_poll(struct dapl_hca *hca_ptr, struct dapl_evd *evd_ptr,
tduffy> struct ib_wc *cqe_ptr)
tduffy> {
tduffy> int ib_status;
tduffy> @@ -810,7 +812,7 @@ u32 dapl_ib_completion_poll(DAPL_HCA *hc
tduffy> return dapl_ib_status_convert(ib_status);
tduffy> }
tduffy>
tduffy> -u32 dapl_ib_completion_notify(DAPL_EVD *evd_ptr)
tduffy> +u32 dapl_ib_completion_notify(struct dapl_evd *evd_ptr)
tduffy> {
tduffy> int ib_status;
tduffy>
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_modify.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_modify.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_modify.c (working copy)
tduffy> @@ -56,12 +56,12 @@ static inline u32
tduffy> dapl_ep_modify_validate_parameters(DAT_EP_HANDLE ep_handle,
tduffy> enum dat_ep_param_mask mask,
tduffy> const struct dat_ep_param *ep_param,
tduffy> - DAPL_IA ** ia_ptr,
tduffy> - DAPL_EP ** ep_ptr,
tduffy> + struct dapl_ia **ia_ptr,
tduffy> + struct dapl_ep **ep_ptr,
tduffy> struct dat_ep_attr *ep_attr_ptr)
tduffy> {
tduffy> - DAPL_IA *ia;
tduffy> - DAPL_EP *ep;
tduffy> + struct dapl_ia *ia;
tduffy> + struct dapl_ep *ep;
tduffy> struct dat_ep_attr ep_attr;
tduffy> struct dat_ep_attr ep_attr_limit;
tduffy> struct dat_ep_attr ep_attr_request;
tduffy> @@ -76,7 +76,7 @@ dapl_ep_modify_validate_parameters(DAT_E
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - ep = (DAPL_EP *) ep_handle;
tduffy> + ep = (struct dapl_ep *)ep_handle;
tduffy> ia = ep->header.owner_ia;
tduffy>
tduffy> /*
tduffy> @@ -139,7 +139,7 @@ dapl_ep_modify_validate_parameters(DAT_E
tduffy> if (mask & DAT_EP_FIELD_RECV_EVD_HANDLE) {
tduffy> if (ep_param->recv_evd_handle != NULL &&
tduffy> (DAPL_BAD_HANDLE(ep_param->recv_evd_handle, DAPL_MAGIC_EVD)
tduffy> - || !((DAPL_EVD *) ep_param->recv_evd_handle)->
tduffy> + || !((struct dapl_evd *)ep_param->recv_evd_handle)->
tduffy> evd_flags & DAT_EVD_DTO_FLAG)) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_PARAMETER, DAT_INVALID_ARG3);
tduffy> @@ -161,7 +161,7 @@ dapl_ep_modify_validate_parameters(DAT_E
tduffy> if (ep_param->connect_evd_handle != NULL &&
tduffy> DAPL_BAD_HANDLE(ep_param->connect_evd_handle,
tduffy> DAPL_MAGIC_EVD)
tduffy> - && !(((DAPL_EVD *) ep_param->connect_evd_handle)->
tduffy> + && !(((struct dapl_evd *)ep_param->connect_evd_handle)->
tduffy> evd_flags & DAT_EVD_CONNECTION_FLAG)) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_PARAMETER, DAT_INVALID_ARG3);
tduffy> @@ -298,13 +298,13 @@ dapl_ep_modify_validate_parameters(DAT_E
tduffy> u32 dapl_ep_modify(DAT_EP_HANDLE ep_handle, enum dat_ep_param_mask mask,
tduffy> const struct dat_ep_param *ep_param)
tduffy> {
tduffy> - DAPL_IA *ia;
tduffy> - DAPL_EP *ep1, *ep2;
tduffy> + struct dapl_ia *ia;
tduffy> + struct dapl_ep *ep1, *ep2;
tduffy> struct dat_ep_attr ep_attr1, ep_attr2;
tduffy> - DAPL_EP new_ep, copy_of_old_ep;
tduffy> - DAPL_EP alloc_ep; /* Holder for resources. */
tduffy> - DAPL_PZ *tmp_pz;
tduffy> - DAPL_EVD *tmp_evd;
tduffy> + struct dapl_ep new_ep, copy_of_old_ep;
tduffy> + struct dapl_ep alloc_ep; /* Holder for resources. */
tduffy> + struct dapl_pz *tmp_pz;
tduffy> + struct dapl_evd *tmp_evd;
tduffy> u32 dat_status;
tduffy>
tduffy> /* Flag indicating we've allocated a new one of these. */
tduffy> @@ -325,9 +325,8 @@ u32 dapl_ep_modify(DAT_EP_HANDLE ep_hand
tduffy> mask,
tduffy> ep_param,
tduffy> &ia, &ep1, &ep_attr1);
tduffy> - if (DAT_SUCCESS != dat_status) {
tduffy> + if (DAT_SUCCESS != dat_status)
tduffy> goto bail;
tduffy> - }
tduffy>
tduffy> /*
tduffy> * Setup the alloc_ep with the appropriate parameters (primarily
tduffy> @@ -335,23 +334,17 @@ u32 dapl_ep_modify(DAT_EP_HANDLE ep_hand
tduffy> */
tduffy> alloc_ep = *ep1;
tduffy> alloc_ep.param.ep_attr = ep_attr1;
tduffy> - if (mask & DAT_EP_FIELD_PZ_HANDLE) {
tduffy> + if (mask & DAT_EP_FIELD_PZ_HANDLE)
tduffy> alloc_ep.param.pz_handle = ep_param->pz_handle;
tduffy> - }
tduffy>
tduffy> - if (mask & DAT_EP_FIELD_RECV_EVD_HANDLE) {
tduffy> + if (mask & DAT_EP_FIELD_RECV_EVD_HANDLE)
tduffy> alloc_ep.param.recv_evd_handle = ep_param->recv_evd_handle;
tduffy> - }
tduffy>
tduffy> - if (mask & DAT_EP_FIELD_REQUEST_EVD_HANDLE) {
tduffy> - alloc_ep.param.request_evd_handle =
tduffy> - ep_param->request_evd_handle;
tduffy> - }
tduffy> + if (mask & DAT_EP_FIELD_REQUEST_EVD_HANDLE)
tduffy> + alloc_ep.param.request_evd_handle = ep_param->request_evd_handle;
tduffy>
tduffy> - if (mask & DAT_EP_FIELD_CONNECT_EVD_HANDLE) {
tduffy> - alloc_ep.param.connect_evd_handle =
tduffy> - ep_param->connect_evd_handle;
tduffy> - }
tduffy> + if (mask & DAT_EP_FIELD_CONNECT_EVD_HANDLE)
tduffy> + alloc_ep.param.connect_evd_handle = ep_param->connect_evd_handle;
tduffy>
tduffy> /*
tduffy> * Allocate everything that might be needed.
tduffy> @@ -364,16 +357,14 @@ u32 dapl_ep_modify(DAT_EP_HANDLE ep_hand
tduffy> */
tduffy> dat_status = dapl_cb_create(&alloc_ep.req_buffer, ep1, /* For pointer in buffer bool. */
tduffy> ep_attr1.max_request_dtos);
tduffy> - if (DAT_SUCCESS != dat_status) {
tduffy> + if (DAT_SUCCESS != dat_status)
tduffy> goto bail;
tduffy> - }
tduffy> rqst_cb_allocated = TRUE;
tduffy>
tduffy> dat_status = dapl_cb_create(&alloc_ep.recv_buffer, ep1, /* For pointer in buffer bool. */
tduffy> ep_attr1.max_recv_dtos);
tduffy> - if (DAT_SUCCESS != dat_status) {
tduffy> + if (DAT_SUCCESS != dat_status)
tduffy> goto bail;
tduffy> - }
tduffy> recv_cb_allocated = TRUE;
tduffy>
tduffy> alloc_ep.send_iov_num = ep_attr1.max_request_iov;
tduffy> @@ -397,9 +388,8 @@ u32 dapl_ep_modify(DAT_EP_HANDLE ep_hand
tduffy> recv_iov_allocated = TRUE;
tduffy>
tduffy> dat_status = dapl_ib_qp_alloc(ia, &alloc_ep, ep1);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> goto bail;
tduffy> - }
tduffy> qp_allocated = TRUE;
tduffy>
tduffy> /*
tduffy> @@ -527,92 +517,79 @@ u32 dapl_ep_modify(DAT_EP_HANDLE ep_hand
tduffy> * and then decrementing old ones (so if they're the same
tduffy> * the refcount never drops to zero).
tduffy> */
tduffy> - tmp_pz = (DAPL_PZ *) new_ep.param.pz_handle;
tduffy> - if (NULL != tmp_pz) {
tduffy> + tmp_pz = (struct dapl_pz *)new_ep.param.pz_handle;
tduffy> + if (tmp_pz)
tduffy> atomic_inc(&tmp_pz->pz_ref_count);
tduffy> - }
tduffy>
tduffy> - tmp_evd = (DAPL_EVD *) new_ep.param.recv_evd_handle;
tduffy> - if (NULL != tmp_evd) {
tduffy> + tmp_evd = (struct dapl_evd *)new_ep.param.recv_evd_handle;
tduffy> + if (tmp_evd)
tduffy> atomic_inc(&tmp_evd->evd_ref_count);
tduffy> - }
tduffy>
tduffy> - tmp_evd = (DAPL_EVD *) new_ep.param.request_evd_handle;
tduffy> - if (NULL != tmp_evd) {
tduffy> + tmp_evd = (struct dapl_evd *)new_ep.param.request_evd_handle;
tduffy> + if (tmp_evd)
tduffy> atomic_inc(&tmp_evd->evd_ref_count);
tduffy> - }
tduffy>
tduffy> - tmp_evd = (DAPL_EVD *) new_ep.param.connect_evd_handle;
tduffy> - if (NULL != tmp_evd) {
tduffy> + tmp_evd = (struct dapl_evd *)new_ep.param.connect_evd_handle;
tduffy> + if (tmp_evd)
tduffy> atomic_inc(&tmp_evd->evd_ref_count);
tduffy> - }
tduffy>
tduffy> /* decreament the old reference counts */
tduffy> - tmp_pz = (DAPL_PZ *) copy_of_old_ep.param.pz_handle;
tduffy> - if (NULL != tmp_pz) {
tduffy> + tmp_pz = (struct dapl_pz *)copy_of_old_ep.param.pz_handle;
tduffy> + if (tmp_pz)
tduffy> atomic_dec(&tmp_pz->pz_ref_count);
tduffy> - }
tduffy>
tduffy> - tmp_evd = (DAPL_EVD *) copy_of_old_ep.param.recv_evd_handle;
tduffy> - if (NULL != tmp_evd) {
tduffy> + tmp_evd = (struct dapl_evd *)copy_of_old_ep.param.recv_evd_handle;
tduffy> + if (tmp_evd)
tduffy> atomic_dec(&tmp_evd->evd_ref_count);
tduffy> - }
tduffy>
tduffy> - tmp_evd = (DAPL_EVD *) copy_of_old_ep.param.request_evd_handle;
tduffy> - if (NULL != tmp_evd) {
tduffy> + tmp_evd = (struct dapl_evd *)copy_of_old_ep.param.request_evd_handle;
tduffy> + if (tmp_evd)
tduffy> atomic_dec(&tmp_evd->evd_ref_count);
tduffy> - }
tduffy>
tduffy> - tmp_evd = (DAPL_EVD *) copy_of_old_ep.param.connect_evd_handle;
tduffy> - if (NULL != tmp_evd) {
tduffy> + tmp_evd = (struct dapl_evd *)copy_of_old_ep.param.connect_evd_handle;
tduffy> + if (tmp_evd)
tduffy> atomic_dec(&tmp_evd->evd_ref_count);
tduffy> - }
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> if (qp_allocated) {
tduffy> u32 local_dat_status;
tduffy> - if (dat_status != DAT_SUCCESS || !qp_used) {
tduffy> + if (dat_status != DAT_SUCCESS || !qp_used)
tduffy> local_dat_status = dapl_ib_qp_free(ia, &alloc_ep);
tduffy> - } else {
tduffy> + else
tduffy> local_dat_status = dapl_ib_qp_free(ia, ©_of_old_ep);
tduffy> - }
tduffy> - if (local_dat_status != DAT_SUCCESS) {
tduffy> + if (local_dat_status != DAT_SUCCESS)
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_WARN,
tduffy> "ep_modify: Failed to free QP; status %x\n",
tduffy> local_dat_status);
tduffy> - }
tduffy> }
tduffy>
tduffy> if (rqst_cb_allocated) {
tduffy> - if (dat_status != DAT_SUCCESS || !rqst_cb_used) {
tduffy> + if (dat_status != DAT_SUCCESS || !rqst_cb_used)
tduffy> dapl_cb_free(&alloc_ep.req_buffer);
tduffy> - } else {
tduffy> + else
tduffy> dapl_cb_free(©_of_old_ep.req_buffer);
tduffy> - }
tduffy> }
tduffy>
tduffy> if (recv_cb_allocated) {
tduffy> - if (dat_status != DAT_SUCCESS || !recv_cb_used) {
tduffy> + if (dat_status != DAT_SUCCESS || !recv_cb_used)
tduffy> dapl_cb_free(&alloc_ep.recv_buffer);
tduffy> - } else {
tduffy> + else
tduffy> dapl_cb_free(©_of_old_ep.recv_buffer);
tduffy> - }
tduffy> }
tduffy>
tduffy> if (rqst_iov_allocated) {
tduffy> - if (dat_status != DAT_SUCCESS || !rqst_iov_used) {
tduffy> + if (dat_status != DAT_SUCCESS || !rqst_iov_used)
tduffy> kfree(alloc_ep.send_iov);
tduffy> - } else {
tduffy> + else
tduffy> kfree(copy_of_old_ep.send_iov);
tduffy> - }
tduffy> }
tduffy>
tduffy> if (recv_iov_allocated) {
tduffy> - if (dat_status != DAT_SUCCESS || !recv_iov_used) {
tduffy> + if (dat_status != DAT_SUCCESS || !recv_iov_used)
tduffy> kfree(alloc_ep.recv_iov);
tduffy> - } else {
tduffy> + else
tduffy> kfree(copy_of_old_ep.recv_iov);
tduffy> - }
tduffy> }
tduffy> +
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_openib_qp.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_openib_qp.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_openib_qp.c (working copy)
tduffy> @@ -44,7 +44,8 @@
tduffy> #include "dapl_evd_util.h"
tduffy> #include "dapl_openib_util.h"
tduffy>
tduffy> -struct ib_cq * dapl_get_dto_cq(DAPL_IA * ia_ptr, DAPL_EVD * recv_evd_ptr);
tduffy> +struct ib_cq *dapl_get_dto_cq(struct dapl_ia *ia_ptr,
tduffy> + struct dapl_evd *recv_evd_ptr);
tduffy>
tduffy> /*
tduffy> * dapl_ib_qp_alloc
tduffy> @@ -66,7 +67,8 @@ struct ib_cq * dapl_get_dto_cq(DAPL_IA *
tduffy> * DAT_INSUFFICIENT_RESOURCES
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_qp_alloc(DAPL_IA *ia_ptr, DAPL_EP *ep_ptr, DAPL_EP *ep_ctx_ptr)
tduffy> +u32 dapl_ib_qp_alloc(struct dapl_ia *ia_ptr, struct dapl_ep *ep_ptr,
tduffy> + struct dapl_ep *ep_ctx_ptr)
tduffy> {
tduffy> struct dat_ep_attr *attr;
tduffy> int ib_status;
tduffy> @@ -80,15 +82,15 @@ u32 dapl_ib_qp_alloc(DAPL_IA *ia_ptr, DA
tduffy>
tduffy> dapl_os_assert(ep_ptr->param.pz_handle != NULL);
tduffy> ib_pd_handle =
tduffy> - (struct ib_pd *)((DAPL_PZ *) ep_ptr->param.pz_handle)->pd_handle;
tduffy> + (struct ib_pd *)((struct dapl_pz *)ep_ptr->param.pz_handle)->pd_handle;
tduffy> ib_hca_handle = ia_ptr->hca_ptr->ib_hca_handle;
tduffy>
tduffy> cq_recv = NULL;
tduffy> cq_send = NULL;
tduffy> cq_recv = dapl_get_dto_cq(ia_ptr,
tduffy> - (DAPL_EVD *) ep_ptr->param.recv_evd_handle);
tduffy> + (struct dapl_evd *)ep_ptr->param.recv_evd_handle);
tduffy> cq_send = dapl_get_dto_cq(ia_ptr,
tduffy> - (DAPL_EVD *) ep_ptr->param.
tduffy> + (struct dapl_evd *)ep_ptr->param.
tduffy> request_evd_handle);
tduffy>
tduffy> qp_attr.send_cq = cq_send;
tduffy> @@ -151,7 +153,7 @@ u32 dapl_ib_qp_alloc(DAPL_IA *ia_ptr, DA
tduffy> * Status of destroy operation.
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_qp_free(DAPL_IA *ia_ptr, DAPL_EP *ep_ptr)
tduffy> +u32 dapl_ib_qp_free(struct dapl_ia *ia_ptr, struct dapl_ep *ep_ptr)
tduffy> {
tduffy> int ib_status;
tduffy>
tduffy> @@ -178,7 +180,7 @@ u32 dapl_ib_qp_free(DAPL_IA *ia_ptr, DAP
tduffy> * Returns
tduffy> * A valid CQ handle
tduffy> */
tduffy> -struct ib_cq * dapl_get_dto_cq(DAPL_IA * ia_ptr, DAPL_EVD * evd_ptr)
tduffy> +struct ib_cq *dapl_get_dto_cq(struct dapl_ia *ia_ptr, struct dapl_evd *evd_ptr)
tduffy> {
tduffy> struct ib_cq *cq_handle;
tduffy> int cq_entries;
tduffy> @@ -232,7 +234,7 @@ struct ib_cq * dapl_get_dto_cq(DAPL_IA *
tduffy> * DAT_INVALID_PARAMETER
tduffy> *
tduffy> */
tduffy> -u32 dapl_ib_qp_modify(DAPL_IA *ia_ptr, DAPL_EP *ep_ptr,
tduffy> +u32 dapl_ib_qp_modify(struct dapl_ia *ia_ptr, struct dapl_ep *ep_ptr,
tduffy> struct dat_ep_attr *ep_attr)
tduffy> {
tduffy> struct ib_qp_attr qp_attr;
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_kcreate.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_kcreate.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_kcreate.c (working copy)
tduffy> @@ -53,9 +53,9 @@ u32 dapl_evd_kcreate(DAT_IA_HANDLE ia_ha
tduffy> const struct dat_upcall_object *upcall,
tduffy> enum dat_evd_flags evd_flags, DAT_EVD_HANDLE *evd_handle)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_EVD *evd_ptr;
tduffy> - DAPL_CNO *cno_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> + struct dapl_cno *cno_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> DAT_EVD_HANDLE evdhandle = (DAT_EVD_HANDLE) NULL;
tduffy>
tduffy> @@ -64,7 +64,7 @@ u32 dapl_evd_kcreate(DAT_IA_HANDLE ia_ha
tduffy> ia_handle,
tduffy> evd_min_qlen, upcall_policy, evd_flags, evd_handle);
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)ia_handle;
tduffy> cno_ptr = NULL;
tduffy> evd_ptr = NULL;
tduffy> *evd_handle = NULL;
tduffy> @@ -94,38 +94,31 @@ u32 dapl_evd_kcreate(DAT_IA_HANDLE ia_ha
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - cno_ptr = dapl_cno_alloc (ia_ptr, upcall);
tduffy> + cno_ptr = dapl_cno_alloc(ia_ptr, upcall);
tduffy>
tduffy> - if (!cno_ptr)
tduffy> - {
tduffy> + if (!cno_ptr) {
tduffy> dat_status = DAT_INSUFFICIENT_RESOURCES;
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - cno_ptr->cno_upcall_policy = upcall_policy;
tduffy> -
tduffy> + cno_ptr->cno_upcall_policy = upcall_policy;
tduffy>
tduffy> dat_status = dapl_evd_internal_create(ia_ptr,
tduffy> cno_ptr,
tduffy> evd_min_qlen,
tduffy> evd_flags, &evd_ptr);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> goto bail;
tduffy> - }
tduffy>
tduffy> evdhandle = *evd_handle = (DAT_EVD_HANDLE) evd_ptr;
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> if (dat_status != DAT_SUCCESS && cno_ptr != NULL)
tduffy> - {
tduffy> dapl_cno_dealloc (cno_ptr);
tduffy> - }
tduffy>
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> - if (evd_ptr) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> + if (evd_ptr)
tduffy> dapl_evd_free(evd_ptr);
tduffy> - }
tduffy> - }
tduffy>
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_cno_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_cno_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_cno_util.c (working copy)
tduffy> @@ -38,9 +38,10 @@
tduffy> /*
tduffy> * alloc and initialize an EVD struct
tduffy> */
tduffy> -DAPL_CNO *dapl_cno_alloc(DAPL_IA *ia_ptr, const struct dat_upcall_object *upcall)
tduffy> +struct dapl_cno *dapl_cno_alloc(struct dapl_ia *ia_ptr,
tduffy> + const struct dat_upcall_object *upcall)
tduffy> {
tduffy> - DAPL_CNO *cno_ptr;
tduffy> + struct dapl_cno *cno_ptr;
tduffy>
tduffy> cno_ptr = kmalloc(sizeof *cno_ptr, GFP_ATOMIC);
tduffy> if (!cno_ptr)
tduffy> @@ -71,7 +72,7 @@ DAPL_CNO *dapl_cno_alloc(DAPL_IA *ia_ptr
tduffy> /*
tduffy> * Free the passed in CNO structure.
tduffy> */
tduffy> -void dapl_cno_dealloc(DAPL_CNO *cno_ptr)
tduffy> +void dapl_cno_dealloc(struct dapl_cno *cno_ptr)
tduffy> {
tduffy> dapl_os_assert(cno_ptr->header.magic == DAPL_MAGIC_CNO);
tduffy>
tduffy> @@ -98,7 +99,7 @@ void dapl_cno_dealloc(DAPL_CNO *cno_ptr)
tduffy> * Returns:
tduffy> * None
tduffy> */
tduffy> -void dapl_cno_trigger(DAPL_CNO *cno_ptr, DAPL_EVD *evd_ptr)
tduffy> +void dapl_cno_trigger(struct dapl_cno *cno_ptr, struct dapl_evd *evd_ptr)
tduffy> {
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> struct dat_event event;
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_timer_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_timer_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_timer_util.c (working copy)
tduffy> @@ -53,7 +53,7 @@
tduffy> #include "dapl_timer_util.h"
tduffy>
tduffy> struct dapl_timer_head {
tduffy> - DAPL_LLIST_HEAD timer_list_head;
tduffy> + struct dapl_llist_entry *timer_list_head;
tduffy> spinlock_t lock;
tduffy> unsigned long flags;
tduffy> DAPL_OS_WAIT_OBJECT wait_object;
tduffy> @@ -129,7 +129,8 @@ u32 dapl_timer_set(struct dapl_timer_ent
tduffy> if (dapl_llist_is_empty(&g_dapl_timer_head.timer_list_head)) {
tduffy> /* Case 1: add entry to head of list */
tduffy> dapl_llist_add_head(&g_dapl_timer_head.timer_list_head,
tduffy> - (DAPL_LLIST_ENTRY *) & timer->list_entry,
tduffy> + (struct dapl_llist_entry *)
tduffy> + &timer->list_entry,
tduffy> timer);
tduffy> wakeup_tmo_thread = TRUE;
tduffy> } else {
tduffy> @@ -139,42 +140,41 @@ u32 dapl_timer_set(struct dapl_timer_ent
tduffy> if (timer->expires < list_ptr->expires) {
tduffy> /* Case 2: add entry to head of list */
tduffy> dapl_llist_add_head(&g_dapl_timer_head.timer_list_head,
tduffy> - (DAPL_LLIST_ENTRY *) & timer->
tduffy> - list_entry, timer);
tduffy> + (struct dapl_llist_entry *)
tduffy> + &timer->list_entry, timer);
tduffy> wakeup_tmo_thread = TRUE;
tduffy> } else {
tduffy> /* Case 3: figure out where entry goes in sorted list */
tduffy> list_ptr =
tduffy> dapl_llist_next_entry(&g_dapl_timer_head.
tduffy> timer_list_head,
tduffy> - (DAPL_LLIST_ENTRY *) &
tduffy> - list_ptr->list_entry);
tduffy> + (struct dapl_llist_entry *)
tduffy> + &list_ptr->list_entry);
tduffy>
tduffy> while (list_ptr != NULL) {
tduffy> if (timer->expires < list_ptr->expires) {
tduffy> dapl_llist_add_entry(&g_dapl_timer_head.
tduffy> timer_list_head,
tduffy> - (DAPL_LLIST_ENTRY
tduffy> - *) & list_ptr->
tduffy> - list_entry,
tduffy> - (DAPL_LLIST_ENTRY
tduffy> - *) & timer->
tduffy> - list_entry, timer);
tduffy> + (struct dapl_llist_entry *)
tduffy> + &list_ptr->list_entry,
tduffy> + (struct dapl_llist_entry *)
tduffy> + &timer->list_entry,
tduffy> + timer);
tduffy> break;
tduffy>
tduffy> }
tduffy> list_ptr =
tduffy> dapl_llist_next_entry(&g_dapl_timer_head.
tduffy> timer_list_head,
tduffy> - (DAPL_LLIST_ENTRY *) &
tduffy> - list_ptr->list_entry);
tduffy> + (struct dapl_llist_entry *)
tduffy> + &list_ptr->list_entry);
tduffy> }
tduffy> if (list_ptr == NULL) {
tduffy> /* entry goes to the end of the list */
tduffy> dapl_llist_add_tail(&g_dapl_timer_head.
tduffy> timer_list_head,
tduffy> - (DAPL_LLIST_ENTRY *) &
tduffy> - timer->list_entry, timer);
tduffy> + (struct dapl_llist_entry *)
tduffy> + &timer->list_entry, timer);
tduffy> }
tduffy> }
tduffy>
tduffy> @@ -209,8 +209,8 @@ void dapl_timer_cancel(struct dapl_timer
tduffy> if (!dapl_llist_is_empty(&g_dapl_timer_head.timer_list_head) &&
tduffy> timer->list_entry.list_head == &g_dapl_timer_head.timer_list_head) {
tduffy> dapl_llist_remove_entry(&g_dapl_timer_head.timer_list_head,
tduffy> - (DAPL_LLIST_ENTRY *) & timer->
tduffy> - list_entry);
tduffy> + (struct dapl_llist_entry *)
tduffy> + &timer->list_entry);
tduffy> }
tduffy> /*
tduffy> * If this was the first entry on the queue we could awaken the
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_openib_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_openib_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_openib_util.h (working copy)
tduffy> @@ -62,15 +62,16 @@ u32 dapl_ib_enum_hcas(const char *vendor
tduffy>
tduffy> u32 dapl_ib_get_instance_data(DAPL_HCA_NAME hca_name, char *instance);
tduffy>
tduffy> -u32 dapl_ib_open_hca(char *namestr, DAPL_HCA *hca_ptr);
tduffy> +u32 dapl_ib_open_hca(char *namestr, struct dapl_hca *hca_ptr);
tduffy>
tduffy> -u32 dapl_ib_close_hca(DAPL_HCA *hca_ptr);
tduffy> +u32 dapl_ib_close_hca(struct dapl_hca *hca_ptr);
tduffy>
tduffy> -u32 dapl_ib_qp_alloc(DAPL_IA *ia_ptr, DAPL_EP *ep_ptr, DAPL_EP *ep_ctx_ptr);
tduffy> +u32 dapl_ib_qp_alloc(struct dapl_ia *ia_ptr, struct dapl_ep *ep_ptr,
tduffy> + struct dapl_ep *ep_ctx_ptr);
tduffy>
tduffy> -u32 dapl_ib_qp_free(DAPL_IA *ia_ptr, DAPL_EP *ep_ptr);
tduffy> +u32 dapl_ib_qp_free(struct dapl_ia *ia_ptr, struct dapl_ep *ep_ptr);
tduffy>
tduffy> -u32 dapl_ib_qp_modify(DAPL_IA *ia_ptr, DAPL_EP *ep_ptr,
tduffy> +u32 dapl_ib_qp_modify(struct dapl_ia *ia_ptr, struct dapl_ep *ep_ptr,
tduffy> struct dat_ep_attr *ep_attr);
tduffy>
tduffy> u32 dapl_ib_connect(DAT_EP_HANDLE ep_handle,
tduffy> @@ -78,12 +79,12 @@ u32 dapl_ib_connect(DAT_EP_HANDLE ep_han
tduffy> DAT_CONN_QUAL remote_conn_qual,
tduffy> int private_data_size, void *private_data);
tduffy>
tduffy> -u32 dapl_ib_disconnect(DAPL_EP *ep_ptr, enum dat_close_flags close_flags);
tduffy> +u32 dapl_ib_disconnect(struct dapl_ep *ep_ptr, enum dat_close_flags close_flags);
tduffy>
tduffy> -u32 dapl_ib_setup_conn_listener(DAPL_IA *ia_ptr, u64 ServiceID,
tduffy> - DAPL_SP *sp_ptr);
tduffy> +u32 dapl_ib_setup_conn_listener(struct dapl_ia *ia_ptr, u64 ServiceID,
tduffy> + struct dapl_sp *sp_ptr);
tduffy>
tduffy> -u32 dapl_ib_remove_conn_listener(DAPL_IA *ia_ptr, DAPL_SP *sp_ptr);
tduffy> +u32 dapl_ib_remove_conn_listener(struct dapl_ia *ia_ptr, struct dapl_sp *sp_ptr);
tduffy>
tduffy> u32 dapl_ib_accept_connection(DAT_CR_HANDLE cr_handle,
tduffy> DAT_EP_HANDLE ep_handle,
tduffy> @@ -92,61 +93,63 @@ u32 dapl_ib_accept_connection(DAT_CR_HAN
tduffy>
tduffy> u32 dapl_ib_reject_connection(struct dapl_cm_id *cm_handle);
tduffy>
tduffy> -u32 dapl_ib_setup_async_callback(DAPL_IA *ia_ptr,
tduffy> +u32 dapl_ib_setup_async_callback(struct dapl_ia *ia_ptr,
tduffy> DAPL_ASYNC_HANDLER_TYPE handler_type,
tduffy> ib_async_handler_t callback, void *context);
tduffy>
tduffy> -u32 dapl_ib_cq_alloc(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr, int *cqlen,
tduffy> - ib_comp_handler callback);
tduffy> +u32 dapl_ib_cq_alloc(struct dapl_ia *ia_ptr, struct dapl_evd *evd_ptr,
tduffy> + int *cqlen, ib_comp_handler callback);
tduffy>
tduffy> -u32 dapl_ib_cq_free(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr);
tduffy> +u32 dapl_ib_cq_free(struct dapl_ia *ia_ptr, struct dapl_evd *evd_ptr);
tduffy>
tduffy> -u32 dapl_set_cq_notify(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr);
tduffy> +u32 dapl_set_cq_notify(struct dapl_ia *ia_ptr, struct dapl_evd *evd_ptr);
tduffy>
tduffy> -u32 dapl_ib_cq_resize(DAPL_IA *ia_ptr, DAPL_EVD *evd_ptr, int *cqlen);
tduffy> +u32 dapl_ib_cq_resize(struct dapl_ia *ia_ptr, struct dapl_evd *evd_ptr,
tduffy> + int *cqlen);
tduffy>
tduffy> -u32 dapl_ib_pd_alloc(DAPL_IA *ia_ptr, DAPL_PZ *pz);
tduffy> +u32 dapl_ib_pd_alloc(struct dapl_ia *ia_ptr, struct dapl_pz *pz);
tduffy>
tduffy> -u32 dapl_ib_pd_free(DAPL_PZ *pz);
tduffy> +u32 dapl_ib_pd_free(struct dapl_pz *pz);
tduffy>
tduffy> -u32 dapl_ib_mr_register(DAPL_IA *ia_ptr, DAPL_LMR *lmr, void *virt_addr,
tduffy> - u64 length, enum dat_mem_priv_flags privileges);
tduffy> +u32 dapl_ib_mr_register(struct dapl_ia *ia_ptr, struct dapl_lmr *lmr,
tduffy> + void *virt_addr, u64 length,
tduffy> + enum dat_mem_priv_flags privileges);
tduffy>
tduffy> -u32 dapl_ib_mr_register_physical(DAPL_IA *ia_ptr, DAPL_LMR *lmr,
tduffy> +u32 dapl_ib_mr_register_physical(struct dapl_ia *ia_ptr, struct dapl_lmr *lmr,
tduffy> void *phys_addr, u64 length,
tduffy> enum dat_mem_priv_flags privileges);
tduffy>
tduffy> -u32 dapl_ib_mr_deregister(DAPL_LMR *lmr);
tduffy> +u32 dapl_ib_mr_deregister(struct dapl_lmr *lmr);
tduffy>
tduffy> -u32 dapl_ib_mr_register_shared(DAPL_IA *ia_ptr, DAPL_LMR *lmr,
tduffy> +u32 dapl_ib_mr_register_shared(struct dapl_ia *ia_ptr, struct dapl_lmr *lmr,
tduffy> enum dat_mem_priv_flags privileges);
tduffy>
tduffy> -u32 dapl_ib_mw_alloc(DAPL_RMR *rmr);
tduffy> +u32 dapl_ib_mw_alloc(struct dapl_rmr *rmr);
tduffy>
tduffy> -u32 dapl_ib_mw_free(DAPL_RMR *rmr);
tduffy> +u32 dapl_ib_mw_free(struct dapl_rmr *rmr);
tduffy>
tduffy> -u32 dapl_ib_mw_bind(DAPL_RMR *rmr, DAPL_LMR *lmr, DAPL_EP *ep,
tduffy> - DAPL_COOKIE *cookie, u64 virtual_address,
tduffy> - u64 length, enum dat_mem_priv_flags mem_priv,
tduffy> - boolean_t is_signaled);
tduffy> +u32 dapl_ib_mw_bind(struct dapl_rmr *rmr, struct dapl_lmr *lmr,
tduffy> + struct dapl_ep *ep, struct dapl_cookie *cookie,
tduffy> + u64 virtual_address, u64 length,
tduffy> + enum dat_mem_priv_flags mem_priv, boolean_t is_signaled);
tduffy>
tduffy> -u32 dapl_ib_mw_unbind(DAPL_RMR *rmr, DAPL_EP *ep, DAPL_COOKIE *cookie,
tduffy> - boolean_t is_signaled);
tduffy> +u32 dapl_ib_mw_unbind(struct dapl_rmr *rmr, struct dapl_ep *ep,
tduffy> + struct dapl_cookie *cookie, boolean_t is_signaled);
tduffy>
tduffy> -u32 dapl_ib_query_hca(DAPL_HCA *hca_ptr, struct dat_ia_attr *ia_attr,
tduffy> +u32 dapl_ib_query_hca(struct dapl_hca *hca_ptr, struct dat_ia_attr *ia_attr,
tduffy> struct dat_ep_attr *ep_attr,
tduffy> struct sockaddr_in6 *ip_addr);
tduffy>
tduffy> -u32 dapl_ib_completion_poll(DAPL_HCA *hca_ptr, DAPL_EVD *evd_ptr,
tduffy> +u32 dapl_ib_completion_poll(struct dapl_hca *hca_ptr, struct dapl_evd *evd_ptr,
tduffy> struct ib_wc *cqe_ptr);
tduffy>
tduffy> -u32 dapl_ib_completion_notify(DAPL_EVD *evd_ptr);
tduffy> +u32 dapl_ib_completion_notify(struct dapl_evd *evd_ptr);
tduffy>
tduffy> enum dat_dto_completion_status dapl_ib_get_dto_status(struct ib_wc *cqe_ptr);
tduffy>
tduffy> -void dapl_ib_reinit_ep(DAPL_EP * ep_ptr);
tduffy> +void dapl_ib_reinit_ep(struct dapl_ep * ep_ptr);
tduffy>
tduffy> -void dapl_ib_disconnect_clean(DAPL_EP * ep_ptr, boolean_t passive);
tduffy> +void dapl_ib_disconnect_clean(struct dapl_ep * ep_ptr, boolean_t passive);
tduffy>
tduffy> u32 dapl_ib_get_async_event(struct ib_event *cause_ptr,
tduffy> enum dat_event_number *async_event);
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_kquery.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_kquery.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_kquery.c (working copy)
tduffy> @@ -40,7 +40,7 @@
tduffy>
tduffy> u32 dapl_evd_kquery(DAT_EVD_HANDLE evd_handle, struct dat_evd_param *evd_param)
tduffy> {
tduffy> - DAPL_EVD *evd_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> if (NULL == evd_param) {
tduffy> @@ -58,7 +58,7 @@ u32 dapl_evd_kquery(DAT_EVD_HANDLE evd_h
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - evd_ptr = (DAPL_EVD *) evd_handle;
tduffy> + evd_ptr = (struct dapl_evd *)evd_handle;
tduffy> /*
tduffy> * We may be racing against the thread safe modify
tduffy> * calls here (dat_evd_{enable,disable,{set,clear}_unwaitable}).
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ia_close.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ia_close.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ia_close.c (working copy)
tduffy> @@ -59,13 +59,13 @@
tduffy> */
tduffy> u32 dapl_ia_close(DAT_IA_HANDLE ia_handle, enum dat_close_flags ia_flags)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> u32 dat_status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> "dapl_ia_close (%p, %d)\n", ia_handle, ia_flags);
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)ia_handle;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(ia_ptr, DAPL_MAGIC_IA)) {
tduffy> dat_status =
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_qp_async_error_callb.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_qp_async_error_callb.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_qp_async_error_callb.c (working copy)
tduffy> @@ -54,13 +54,13 @@
tduffy>
tduffy> void dapl_evd_qp_async_error_callback(struct ib_event *cause, void *context)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> - DAPL_EVD *async_evd;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> + struct dapl_evd *async_evd;
tduffy> enum dat_event_number async_event;
tduffy> u32 dat_status;
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) context;
tduffy> - async_evd = (DAPL_EVD *) ep_ptr->header.owner_ia->async_error_evd;
tduffy> + ep_ptr = (struct dapl_ep *)context;
tduffy> + async_evd = (struct dapl_evd *)ep_ptr->header.owner_ia->async_error_evd;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_CALLBACK | DAPL_DBG_TYPE_EXCEPTION,
tduffy> "--> dapl_evd_qp_async_error_callback: ep %p qp %p (%x) state %d\n",
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_cno_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_cno_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_cno_util.h (working copy)
tduffy> @@ -36,16 +36,11 @@
tduffy>
tduffy> #include "dapl.h"
tduffy>
tduffy> -DAPL_CNO *
tduffy> -dapl_cno_alloc(DAPL_IA *ia_ptr, const struct dat_upcall_object *upcall);
tduffy> +struct dapl_cno *dapl_cno_alloc(struct dapl_ia *ia_ptr,
tduffy> + const struct dat_upcall_object *upcall);
tduffy>
tduffy> -void
tduffy> -dapl_cno_dealloc (
tduffy> - DAPL_CNO *cno_ptr) ;
tduffy> +void dapl_cno_dealloc(struct dapl_cno *cno_ptr);
tduffy>
tduffy> -void
tduffy> -dapl_cno_trigger(
tduffy> - DAPL_CNO *cno_ptr,
tduffy> - DAPL_EVD *evd_ptr);
tduffy> +void dapl_cno_trigger(struct dapl_cno *cno_ptr, struct dapl_evd *evd_ptr);
tduffy>
tduffy> #endif
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_srq_set_lw.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_srq_set_lw.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_srq_set_lw.c (working copy)
tduffy> @@ -65,7 +65,7 @@
tduffy>
tduffy> u32 dapl_srq_set_lw(DAT_SRQ_HANDLE srq_handle, int low_watermark)
tduffy> {
tduffy> - DAPL_SRQ *srq_ptr;
tduffy> + struct dapl_srq *srq_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_srq_set_lw (%p, %d)\n",
tduffy> @@ -77,7 +77,7 @@ u32 dapl_srq_set_lw(DAT_SRQ_HANDLE srq_h
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - srq_ptr = (DAPL_SRQ *) srq_handle;
tduffy> + srq_ptr = (struct dapl_srq *)srq_handle;
tduffy>
tduffy> /* XXX Put implementation here XXX */
tduffy>
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_un_async_error_callb.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_un_async_error_callb.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_un_async_error_callb.c (working copy)
tduffy> @@ -46,7 +46,7 @@
tduffy>
tduffy> void dapl_evd_un_async_error_callback(struct ib_event *cause, void *context)
tduffy> {
tduffy> - DAPL_EVD *async_evd;
tduffy> + struct dapl_evd *async_evd;
tduffy> enum dat_event_number async_event;
tduffy> u32 dat_status;
tduffy>
tduffy> @@ -59,7 +59,7 @@ void dapl_evd_un_async_error_callback(st
tduffy> return;
tduffy> }
tduffy>
tduffy> - async_evd = (DAPL_EVD *) context;
tduffy> + async_evd = (struct dapl_evd *)context;
tduffy>
tduffy> dat_status = dapl_ib_get_async_event(cause, &async_event);
tduffy> if (dat_status == DAT_SUCCESS) {
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_cr_accept.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_cr_accept.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_cr_accept.c (working copy)
tduffy> @@ -42,9 +42,9 @@
tduffy> u32 dapl_cr_accept(DAT_CR_HANDLE cr_handle, DAT_EP_HANDLE ep_handle,
tduffy> int private_data_size, const void *private_data)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> u32 dat_status;
tduffy> - DAPL_CR *cr_ptr;
tduffy> + struct dapl_cr *cr_ptr;
tduffy> enum dat_ep_state entry_ep_state;
tduffy> DAT_EP_HANDLE entry_ep_handle;
tduffy>
tduffy> @@ -58,7 +58,7 @@ u32 dapl_cr_accept(DAT_CR_HANDLE cr_hand
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - cr_ptr = (DAPL_CR *) cr_handle;
tduffy> + cr_ptr = (struct dapl_cr *)cr_handle;
tduffy>
tduffy> /*
tduffy> * Return an error if we have an ep_handle and the CR already has an
tduffy> @@ -91,21 +91,21 @@ u32 dapl_cr_accept(DAT_CR_HANDLE cr_hand
tduffy> */
tduffy> if (ep_handle == NULL) {
tduffy> ep_handle = cr_ptr->param.local_ep_handle;
tduffy> - if ((((DAPL_EP *) ep_handle)->param.ep_state !=
tduffy> + if ((((struct dapl_ep *)ep_handle)->param.ep_state !=
tduffy> DAT_EP_STATE_TENTATIVE_CONNECTION_PENDING)
tduffy> - && (((DAPL_EP *) ep_handle)->param.ep_state !=
tduffy> + && (((struct dapl_ep *)ep_handle)->param.ep_state !=
tduffy> DAT_EP_STATE_PASSIVE_CONNECTION_PENDING)) {
tduffy> return DAT_INVALID_STATE;
tduffy> }
tduffy> } else {
tduffy> /* ensure this EP isn't connected or in use */
tduffy> - if (((DAPL_EP *) ep_handle)->param.ep_state !=
tduffy> + if (((struct dapl_ep *)ep_handle)->param.ep_state !=
tduffy> DAT_EP_STATE_UNCONNECTED) {
tduffy> return DAT_INVALID_STATE;
tduffy> }
tduffy> }
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy>
tduffy> /*
tduffy> * Verify the attributes of the EP handle before we connect it. Test
tduffy> @@ -124,7 +124,7 @@ u32 dapl_cr_accept(DAT_CR_HANDLE cr_hand
tduffy> /* test connect handle */
tduffy> || ep_ptr->param.connect_evd_handle == NULL
tduffy> || DAPL_BAD_HANDLE(ep_ptr->param.connect_evd_handle, DAPL_MAGIC_EVD)
tduffy> - || !(((DAPL_EVD *) ep_ptr->param.connect_evd_handle)->
tduffy> + || !(((struct dapl_evd *)ep_ptr->param.connect_evd_handle)->
tduffy> evd_flags & DAT_EVD_CONNECTION_FLAG)
tduffy> /* test optional completion handles */
tduffy> || (ep_ptr->param.recv_evd_handle != DAT_HANDLE_NULL &&
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_rsp_create.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_rsp_create.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_rsp_create.c (working copy)
tduffy> @@ -72,14 +72,14 @@ u32 dapl_rsp_create(DAT_IA_HANDLE ia_han
tduffy> DAT_EP_HANDLE ep_handle, DAT_EVD_HANDLE evd_handle,
tduffy> DAT_RSP_HANDLE *rsp_handle)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_SP *sp_ptr;
tduffy> - DAPL_EVD *evd_ptr;
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> + struct dapl_sp *sp_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> boolean_t sp_found;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)ia_handle;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_CM,
tduffy> ">>> dapl_rsp_free conn_qual: %x EP: %p\n",
tduffy> @@ -106,14 +106,14 @@ u32 dapl_rsp_create(DAT_IA_HANDLE ia_han
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy> if (ep_ptr->param.ep_state != DAT_EP_STATE_UNCONNECTED) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_STATE, dapl_ep_state_subtype(ep_ptr));
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - evd_ptr = (DAPL_EVD *) evd_handle;
tduffy> + evd_ptr = (struct dapl_evd *)evd_handle;
tduffy> if (!(evd_ptr->evd_flags & DAT_EVD_CR_FLAG)) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_HANDLE, DAT_INVALID_HANDLE_EVD_CR);
tduffy> @@ -147,7 +147,7 @@ u32 dapl_rsp_create(DAT_IA_HANDLE ia_han
tduffy> /*
tduffy> * Take a reference on the EVD handle
tduffy> */
tduffy> - atomic_inc(&((DAPL_EVD *) evd_handle)->evd_ref_count);
tduffy> + atomic_inc(&((struct dapl_evd *)evd_handle)->evd_ref_count);
tduffy>
tduffy> /*
tduffy> * Update the EP state indicating the provider now owns it
tduffy> @@ -174,7 +174,7 @@ u32 dapl_rsp_create(DAT_IA_HANDLE ia_han
tduffy> * wrong! Decrements the EVD refcount & release it. Set
tduffy> * the state to FREE, so we know the call failed.
tduffy> */
tduffy> - atomic_dec(&((DAPL_EVD *) evd_handle)->
tduffy> + atomic_dec(&((struct dapl_evd *)evd_handle)->
tduffy> evd_ref_count);
tduffy> sp_ptr->evd_handle = NULL;
tduffy> sp_ptr->state = DAPL_SP_STATE_FREE;
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_srq_post_recv.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_srq_post_recv.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_srq_post_recv.c (working copy)
tduffy> @@ -71,8 +71,8 @@ u32 dapl_srq_post_recv(DAT_SRQ_HANDLE sr
tduffy> struct dat_lmr_triplet *local_iov,
tduffy> DAT_DTO_COOKIE user_cookie)
tduffy> {
tduffy> - DAPL_SRQ *srq_ptr;
tduffy> - DAPL_COOKIE *cookie;
tduffy> + struct dapl_srq *srq_ptr;
tduffy> + struct dapl_cookie *cookie;
tduffy> u32 dat_status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> @@ -85,7 +85,7 @@ u32 dapl_srq_post_recv(DAT_SRQ_HANDLE sr
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - srq_ptr = (DAPL_SRQ *) srq_handle;
tduffy> + srq_ptr = (struct dapl_srq *)srq_handle;
tduffy>
tduffy> /*
tduffy> * Synchronization ok since this buffer is only used for receive
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_lmr_free.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_lmr_free.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_lmr_free.c (working copy)
tduffy> @@ -59,7 +59,7 @@
tduffy>
tduffy> u32 dapl_lmr_free(DAT_LMR_HANDLE lmr_handle)
tduffy> {
tduffy> - DAPL_LMR *lmr;
tduffy> + struct dapl_lmr *lmr;
tduffy> u32 dat_status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_lmr_free (%p)\n", lmr_handle);
tduffy> @@ -70,36 +70,34 @@ u32 dapl_lmr_free(DAT_LMR_HANDLE lmr_han
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - lmr = (DAPL_LMR *) lmr_handle;
tduffy> + lmr = (struct dapl_lmr *)lmr_handle;
tduffy>
tduffy> switch (lmr->param.mem_type) {
tduffy> case DAT_MEM_TYPE_PHYSICAL:
tduffy> case DAT_MEM_TYPE_VIRTUAL:
tduffy> case DAT_MEM_TYPE_LMR:
tduffy> {
tduffy> - DAPL_PZ *pz;
tduffy> + struct dapl_pz *pz;
tduffy>
tduffy> - if (0 != atomic_read(&lmr->lmr_ref_count)) {
tduffy> + if (0 != atomic_read(&lmr->lmr_ref_count))
tduffy> return DAT_INVALID_STATE;
tduffy> - }
tduffy>
tduffy> dat_status =
tduffy> dapl_hash_remove(lmr->header.owner_ia->hca_ptr->
tduffy> lmr_hash_table,
tduffy> lmr->param.lmr_context, NULL);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> goto bail;
tduffy> - }
tduffy>
tduffy> dat_status = dapl_ib_mr_deregister(lmr);
tduffy>
tduffy> if (dat_status == DAT_SUCCESS) {
tduffy>
tduffy> - pz = (DAPL_PZ *) lmr->param.pz_handle;
tduffy> + pz = (struct dapl_pz *)lmr->param.pz_handle;
tduffy> atomic_dec(&pz->pz_ref_count);
tduffy>
tduffy> dapl_lmr_dealloc(lmr);
tduffy> - } else {
tduffy> + } else
tduffy> /*
tduffy> * Deregister failed; put it back in the
tduffy> * hash table.
tduffy> @@ -107,7 +105,6 @@ u32 dapl_lmr_free(DAT_LMR_HANDLE lmr_han
tduffy> dapl_hash_insert(lmr->header.owner_ia->
tduffy> hca_ptr->lmr_hash_table,
tduffy> lmr->param.lmr_context, lmr);
tduffy> - }
tduffy>
tduffy> break;
tduffy> }
tduffy> @@ -124,6 +121,6 @@ u32 dapl_lmr_free(DAT_LMR_HANDLE lmr_han
tduffy> break;
tduffy> }
tduffy> }
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_get_handle_type.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_get_handle_type.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_get_handle_type.c (working copy)
tduffy> @@ -59,9 +59,9 @@
tduffy> u32 dapl_get_handle_type(DAT_HANDLE dat_handle, enum dat_handle_type *type)
tduffy> {
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> - DAPL_HEADER *header;
tduffy> + struct dapl_header *header;
tduffy>
tduffy> - header = (DAPL_HEADER *) dat_handle;
tduffy> + header = (struct dapl_header *)dat_handle;
tduffy> if (((header) == NULL) ||
tduffy> ((unsigned long)(header) & 3) ||
tduffy> (header->magic != DAPL_MAGIC_IA &&
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_rmr_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_rmr_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_rmr_util.c (working copy)
tduffy> @@ -28,9 +28,9 @@
tduffy> #include "dapl_rmr_util.h"
tduffy> #include "dapl_ia_util.h"
tduffy>
tduffy> -DAPL_RMR *dapl_rmr_alloc(DAPL_PZ * pz)
tduffy> +struct dapl_rmr *dapl_rmr_alloc(struct dapl_pz *pz)
tduffy> {
tduffy> - DAPL_RMR *rmr;
tduffy> + struct dapl_rmr *rmr;
tduffy>
tduffy> /* Allocate LMR */
tduffy> rmr = kmalloc(sizeof *rmr, GFP_ATOMIC);
tduffy> @@ -70,9 +70,10 @@ DAPL_RMR *dapl_rmr_alloc(DAPL_PZ * pz)
tduffy> return rmr;
tduffy> }
tduffy>
tduffy> -void dapl_rmr_dealloc(DAPL_RMR * rmr)
tduffy> +void dapl_rmr_dealloc(struct dapl_rmr *rmr)
tduffy> {
tduffy> - rmr->header.magic = DAPL_MAGIC_INVALID; /* reset magic to prevent reuse */
tduffy> + /* reset magic to prevent reuse */
tduffy> + rmr->header.magic = DAPL_MAGIC_INVALID;
tduffy>
tduffy> dapl_ia_unlink_rmr(rmr->header.owner_ia, rmr);
tduffy> /* no need to destroy rmr->header.lock */
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_util.c (working copy)
tduffy> @@ -55,9 +55,10 @@
tduffy> * none
tduffy> *
tduffy> */
tduffy> -DAPL_EP *dapl_ep_alloc(DAPL_IA * ia_ptr, const struct dat_ep_attr *ep_attr)
tduffy> +struct dapl_ep *dapl_ep_alloc(struct dapl_ia *ia_ptr,
tduffy> + const struct dat_ep_attr *ep_attr)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy>
tduffy> /* Allocate EP */
tduffy> ep_ptr = kmalloc(sizeof *ep_ptr + sizeof (struct sockaddr), GFP_ATOMIC);
tduffy> @@ -94,8 +95,7 @@ DAPL_EP *dapl_ep_alloc(DAPL_IA * ia_ptr,
tduffy> (ep_ptr->param.ep_attr.max_request_dtos / 256) + 1;
tduffy> ep_ptr->param.ep_attr.max_recv_dtos =
tduffy> (ep_ptr->param.ep_attr.max_recv_dtos / 256) + 1;
tduffy> - }
tduffy> - else
tduffy> + } else
tduffy> ep_ptr->param.ep_attr = *ep_attr;
tduffy>
tduffy> ep_ptr->qp_handle = NULL;
tduffy> @@ -139,7 +139,7 @@ DAPL_EP *dapl_ep_alloc(DAPL_IA * ia_ptr,
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return ep_ptr;
tduffy> }
tduffy>
tduffy> @@ -158,26 +158,24 @@ DAPL_EP *dapl_ep_alloc(DAPL_IA * ia_ptr,
tduffy> * none
tduffy> *
tduffy> */
tduffy> -void dapl_ep_dealloc(DAPL_EP * ep_ptr)
tduffy> +void dapl_ep_dealloc(struct dapl_ep *ep_ptr)
tduffy> {
tduffy> dapl_os_assert(ep_ptr->header.magic == DAPL_MAGIC_EP);
tduffy>
tduffy> - ep_ptr->header.magic = DAPL_MAGIC_INVALID; /* reset magic to prevent reuse */
tduffy> + /* reset magic to prevent reuse */
tduffy> + ep_ptr->header.magic = DAPL_MAGIC_INVALID;
tduffy>
tduffy> dapl_cb_free(&ep_ptr->req_buffer);
tduffy> dapl_cb_free(&ep_ptr->recv_buffer);
tduffy>
tduffy> - if (NULL != ep_ptr->recv_iov) {
tduffy> + if (ep_ptr->recv_iov)
tduffy> kfree(ep_ptr->recv_iov);
tduffy> - }
tduffy>
tduffy> - if (NULL != ep_ptr->send_iov) {
tduffy> + if (ep_ptr->send_iov)
tduffy> kfree(ep_ptr->send_iov);
tduffy> - }
tduffy>
tduffy> - if (NULL != ep_ptr->cxn_timer) {
tduffy> + if (ep_ptr->cxn_timer)
tduffy> kfree(ep_ptr->cxn_timer);
tduffy> - }
tduffy>
tduffy> kfree(ep_ptr);
tduffy> }
tduffy> @@ -194,9 +192,8 @@ u32 dapl_ep_check_recv_completion_flags(
tduffy> * an EVD completes, even though the dapl handler is invoked.
tduffy> */
tduffy>
tduffy> - if (flags & DAT_COMPLETION_SUPPRESS_FLAG) {
tduffy> + if (flags & DAT_COMPLETION_SUPPRESS_FLAG)
tduffy> return DAT_INVALID_PARAMETER;
tduffy> - }
tduffy>
tduffy> return DAT_SUCCESS;
tduffy> }
tduffy> @@ -208,8 +205,8 @@ u32 dapl_ep_post_send_req(DAT_EP_HANDLE
tduffy> enum dat_completion_flags completion_flags,
tduffy> DAPL_DTO_TYPE dto_type, enum ib_wr_opcode op_type)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> - DAPL_COOKIE *cookie;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> + struct dapl_cookie *cookie;
tduffy> u32 dat_status;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(ep_handle, DAPL_MAGIC_EP)) {
tduffy> @@ -218,7 +215,7 @@ u32 dapl_ep_post_send_req(DAT_EP_HANDLE
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy>
tduffy> /*
tduffy> * Synchronization ok since this buffer is only used for send
tduffy> @@ -226,9 +223,8 @@ u32 dapl_ep_post_send_req(DAT_EP_HANDLE
tduffy> */
tduffy> dat_status = dapl_dto_cookie_alloc(&ep_ptr->req_buffer, dto_type,
tduffy> user_cookie, &cookie);
tduffy> - if (dat_status != DAT_SUCCESS) {
tduffy> + if (dat_status != DAT_SUCCESS)
tduffy> goto bail;
tduffy> - }
tduffy>
tduffy> /*
tduffy> * Take reference before posting to avoid race conditions with
tduffy> @@ -247,7 +243,7 @@ u32 dapl_ep_post_send_req(DAT_EP_HANDLE
tduffy> dapl_cookie_dealloc(&ep_ptr->req_buffer, cookie);
tduffy> }
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy>
tduffy> @@ -259,11 +255,11 @@ u32 dapl_ep_post_send_req(DAT_EP_HANDLE
tduffy> */
tduffy> void dapl_ep_timeout(void *arg)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_CM, "--> dapl_ep_timeout! ep %lx\n", arg);
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) arg;
tduffy> + ep_ptr = (struct dapl_ep *)arg;
tduffy>
tduffy> /* reset the EP state */
tduffy> ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECTED;
tduffy> @@ -271,7 +267,7 @@ void dapl_ep_timeout(void *arg)
tduffy> /* Clean up the EP and put the underlying QP into the ERROR state. */
tduffy> dapl_ib_disconnect_clean(ep_ptr, TRUE);
tduffy>
tduffy> - (void)dapl_evd_post_connection_event((DAPL_EVD *) ep_ptr->param.
tduffy> + (void)dapl_evd_post_connection_event((struct dapl_evd *)ep_ptr->param.
tduffy> connect_evd_handle,
tduffy> DAT_CONNECTION_EVENT_TIMED_OUT,
tduffy> (DAT_HANDLE) ep_ptr, 0, NULL);
tduffy> @@ -283,7 +279,7 @@ void dapl_ep_timeout(void *arg)
tduffy> * Return the INVALID_STATE connection subtype associated with an
tduffy> * INVALID_STATE on an EP. Strictly for error reporting.
tduffy> */
tduffy> -enum dat_return_subtype dapl_ep_state_subtype(DAPL_EP * ep_ptr)
tduffy> +enum dat_return_subtype dapl_ep_state_subtype(struct dapl_ep *ep_ptr)
tduffy> {
tduffy> enum dat_return_subtype dat_status;
tduffy>
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_rmr_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_rmr_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_rmr_util.h (working copy)
tduffy> @@ -39,15 +39,9 @@
tduffy>
tduffy> #include "dapl_mr_util.h"
tduffy>
tduffy> -/*********************************************************************
tduffy> - * *
tduffy> - * Function Prototypes *
tduffy> - * *
tduffy> - *********************************************************************/
tduffy> +extern struct dapl_rmr *dapl_rmr_alloc(struct dapl_pz *pz);
tduffy>
tduffy> -extern DAPL_RMR *dapl_rmr_alloc(DAPL_PZ * pz);
tduffy> -
tduffy> -extern void dapl_rmr_dealloc(DAPL_RMR * rmr);
tduffy> +extern void dapl_rmr_dealloc(struct dapl_rmr *rmr);
tduffy>
tduffy> static inline boolean_t
tduffy> dapl_rmr_validate_completion_flag(enum dat_completion_flags mask,
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_lmr_sync_rdma_write.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_lmr_sync_rdma_write.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_lmr_sync_rdma_write.c (working copy)
tduffy> @@ -45,14 +45,14 @@ u32 dapl_lmr_sync_rdma_write(DAT_IA_HAND
tduffy> const struct dat_lmr_triplet *local_segments,
tduffy> u64 num_segments)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> "dat_lmr_sync_rdma_write (%p, %p, %ld)\n",
tduffy> ia_handle, local_segments, num_segments);
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)ia_handle;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(ia_ptr, DAPL_MAGIC_IA)) {
tduffy> dat_status =
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_rsp_free.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_rsp_free.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_rsp_free.c (working copy)
tduffy> @@ -60,12 +60,12 @@
tduffy> */
tduffy> u32 dapl_rsp_free(DAT_RSP_HANDLE rsp_handle)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_SP *sp_ptr;
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> + struct dapl_sp *sp_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> - sp_ptr = (DAPL_SP *) rsp_handle;
tduffy> + sp_ptr = (struct dapl_sp *)rsp_handle;
tduffy> /*
tduffy> * Verify handle
tduffy> */
tduffy> @@ -76,7 +76,7 @@ u32 dapl_rsp_free(DAT_RSP_HANDLE rsp_han
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - /* ia_ptr = (DAPL_IA *)sp_ptr->header.owner_ia; */
tduffy> + /* ia_ptr = (struct dapl_ia *)sp_ptr->header.owner_ia; */
tduffy> ia_ptr = sp_ptr->header.owner_ia;
tduffy>
tduffy> /*
tduffy> @@ -90,17 +90,16 @@ u32 dapl_rsp_free(DAT_RSP_HANDLE rsp_han
tduffy> * Make sure we don't leave a dangling EP. If the state is still
tduffy> * RESERVED then the RSP still owns it.
tduffy> */
tduffy> - ep_ptr = (DAPL_EP *) sp_ptr->ep_handle;
tduffy> - if (ep_ptr != NULL && ep_ptr->param.ep_state == DAT_EP_STATE_RESERVED) {
tduffy> + ep_ptr = (struct dapl_ep *)sp_ptr->ep_handle;
tduffy> + if (ep_ptr != NULL && ep_ptr->param.ep_state == DAT_EP_STATE_RESERVED)
tduffy> ep_ptr->param.ep_state = DAT_EP_STATE_UNCONNECTED;
tduffy> - }
tduffy> sp_ptr->ep_handle = NULL;
tduffy>
tduffy> /* Release reference on EVD. If an error was encountered in a previous
tduffy> * free the evd_handle will be NULL
tduffy> */
tduffy> if (sp_ptr->evd_handle) {
tduffy> - atomic_dec(&((DAPL_EVD *) sp_ptr->evd_handle)->
tduffy> + atomic_dec(&((struct dapl_evd *)sp_ptr->evd_handle)->
tduffy> evd_ref_count);
tduffy> sp_ptr->evd_handle = NULL;
tduffy> }
tduffy> @@ -138,6 +137,6 @@ u32 dapl_rsp_free(DAT_RSP_HANDLE rsp_han
tduffy> sp_ptr->header.flags);
tduffy> }
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_srq_free.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_srq_free.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_srq_free.c (working copy)
tduffy> @@ -61,14 +61,14 @@
tduffy> */
tduffy> u32 dapl_srq_free(DAT_SRQ_HANDLE srq_handle)
tduffy> {
tduffy> - DAPL_SRQ *srq_ptr;
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_srq *srq_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> struct dat_srq_param *param;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_srq_free (%p)\n", srq_handle);
tduffy>
tduffy> - srq_ptr = (DAPL_SRQ *) srq_handle;
tduffy> + srq_ptr = (struct dapl_srq *)srq_handle;
tduffy> param = &srq_ptr->param;
tduffy>
tduffy> /*
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_util.h (working copy)
tduffy> @@ -42,9 +42,10 @@
tduffy>
tduffy> /* function prototypes */
tduffy>
tduffy> -extern DAPL_EP *dapl_ep_alloc(DAPL_IA * ia, const struct dat_ep_attr *ep_attr);
tduffy> +extern struct dapl_ep *dapl_ep_alloc(struct dapl_ia *ia,
tduffy> + const struct dat_ep_attr *ep_attr);
tduffy>
tduffy> -extern void dapl_ep_dealloc(DAPL_EP * ep_ptr);
tduffy> +extern void dapl_ep_dealloc(struct dapl_ep *ep_ptr);
tduffy>
tduffy> extern u32 dapl_ep_check_recv_completion_flags(enum dat_completion_flags flags);
tduffy>
tduffy> @@ -58,6 +59,6 @@ extern u32 dapl_ep_post_send_req(DAT_EP_
tduffy>
tduffy> void dapl_ep_timeout(void *arg);
tduffy>
tduffy> -enum dat_return_subtype dapl_ep_state_subtype(DAPL_EP * ep_ptr);
tduffy> +enum dat_return_subtype dapl_ep_state_subtype(struct dapl_ep *ep_ptr);
tduffy>
tduffy> #endif /* DAPL_EP_UTIL_H */
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_create_with_srq.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_create_with_srq.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_create_with_srq.c (working copy)
tduffy> @@ -77,8 +77,8 @@ u32 dapl_ep_create_with_srq(DAT_IA_HANDL
tduffy> const struct dat_ep_attr *ep_attr,
tduffy> DAT_EP_HANDLE *ep_handle)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> struct dat_ep_attr *ep_attr_limit;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> @@ -90,7 +90,7 @@ u32 dapl_ep_create_with_srq(DAT_IA_HANDL
tduffy> request_evd_handle,
tduffy> connect_evd_handle, srq_handle, ep_attr, ep_handle);
tduffy>
tduffy> - ia_ptr = (DAPL_IA *) ia_handle;
tduffy> + ia_ptr = (struct dapl_ia *)ia_handle;
tduffy>
tduffy> /*
tduffy> * Verify parameters
tduffy> @@ -116,7 +116,7 @@ u32 dapl_ep_create_with_srq(DAT_IA_HANDL
tduffy> /* If connect handle is !NULL verify handle is good */
tduffy> if (connect_evd_handle != DAT_HANDLE_NULL &&
tduffy> (DAPL_BAD_HANDLE(connect_evd_handle, DAPL_MAGIC_EVD) ||
tduffy> - !(((DAPL_EVD *) connect_evd_handle)->
tduffy> + !(((struct dapl_evd *)connect_evd_handle)->
tduffy> evd_flags & DAT_EVD_CONNECTION_FLAG))) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_HANDLE, DAT_INVALID_HANDLE_EVD_CONN);
tduffy> @@ -125,7 +125,7 @@ u32 dapl_ep_create_with_srq(DAT_IA_HANDL
tduffy> /* If recv_evd is !NULL, verify handle is good and flags are valid */
tduffy> if (recv_evd_handle != DAT_HANDLE_NULL &&
tduffy> (DAPL_BAD_HANDLE(recv_evd_handle, DAPL_MAGIC_EVD) ||
tduffy> - !(((DAPL_EVD *) recv_evd_handle)->evd_flags & DAT_EVD_DTO_FLAG))) {
tduffy> + !(((struct dapl_evd *)recv_evd_handle)->evd_flags & DAT_EVD_DTO_FLAG))) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_HANDLE, DAT_INVALID_HANDLE_EVD_RECV);
tduffy> goto bail;
tduffy> @@ -134,7 +134,7 @@ u32 dapl_ep_create_with_srq(DAT_IA_HANDL
tduffy> /* If req_evd is !NULL, verify handle is good and flags are valid */
tduffy> if (request_evd_handle != DAT_HANDLE_NULL &&
tduffy> (DAPL_BAD_HANDLE(request_evd_handle, DAPL_MAGIC_EVD) ||
tduffy> - !(((DAPL_EVD *) request_evd_handle)->
tduffy> + !(((struct dapl_evd *)request_evd_handle)->
tduffy> evd_flags & DAT_EVD_DTO_FLAG))) {
tduffy> dat_status =
tduffy> DAT_ERROR(DAT_INVALID_HANDLE,
tduffy> @@ -253,7 +253,7 @@ u32 dapl_ep_create_with_srq(DAT_IA_HANDL
tduffy> */
tduffy> if (pz_handle != DAT_HANDLE_NULL) {
tduffy> /* Take a reference on the PZ handle */
tduffy> - atomic_inc(&((DAPL_PZ *) pz_handle)->pz_ref_count);
tduffy> + atomic_inc(&((struct dapl_pz *)pz_handle)->pz_ref_count);
tduffy>
tduffy> /*
tduffy> * Get a QP from the IB provider
tduffy> @@ -261,14 +261,12 @@ u32 dapl_ep_create_with_srq(DAT_IA_HANDL
tduffy> dat_status = dapl_ib_qp_alloc(ia_ptr, ep_ptr, ep_ptr);
tduffy>
tduffy> if (dat_status != DAT_SUCCESS) {
tduffy> - atomic_dec(&((DAPL_PZ *) pz_handle)->
tduffy> - pz_ref_count);
tduffy> + atomic_dec(&((struct dapl_pz *)pz_handle)->pz_ref_count);
tduffy> dapl_ep_dealloc(ep_ptr);
tduffy> goto bail;
tduffy> }
tduffy> - } else {
tduffy> + } else
tduffy> ep_ptr->qp_state = DAPL_QP_STATE_UNATTACHED;
tduffy> - }
tduffy>
tduffy> /*
tduffy> * Update ref counts. See the spec where the endpoint marks
tduffy> @@ -278,16 +276,14 @@ u32 dapl_ep_create_with_srq(DAT_IA_HANDL
tduffy> *
tduffy> * N.B. This should really be done by a util routine.
tduffy> */
tduffy> - atomic_inc(&((DAPL_EVD *) connect_evd_handle)->evd_ref_count);
tduffy> + atomic_inc(&((struct dapl_evd *)connect_evd_handle)->evd_ref_count);
tduffy> /* Optional handles */
tduffy> - if (recv_evd_handle != DAT_HANDLE_NULL) {
tduffy> - atomic_inc(&((DAPL_EVD *) recv_evd_handle)->
tduffy> + if (recv_evd_handle != DAT_HANDLE_NULL)
tduffy> + atomic_inc(&((struct dapl_evd *)recv_evd_handle)->
tduffy> evd_ref_count);
tduffy> - }
tduffy> - if (request_evd_handle != DAT_HANDLE_NULL) {
tduffy> - atomic_inc(&((DAPL_EVD *) request_evd_handle)->
tduffy> + if (request_evd_handle != DAT_HANDLE_NULL)
tduffy> + atomic_inc(&((struct dapl_evd *)request_evd_handle)->
tduffy> evd_ref_count);
tduffy> - }
tduffy>
tduffy> /* Link it onto the IA */
tduffy> dapl_ia_link_ep(ia_ptr, ep_ptr);
tduffy> @@ -296,6 +292,6 @@ u32 dapl_ep_create_with_srq(DAT_IA_HANDL
tduffy>
tduffy> #endif /* notdef */
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ia_open.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ia_open.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ia_open.c (working copy)
tduffy> @@ -57,12 +57,9 @@ u32 dapl_ia_open(const char *name, int a
tduffy> {
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> struct dat_provider *provider;
tduffy> - DAPL_HCA *hca_ptr;
tduffy> - DAPL_IA *ia_ptr;
tduffy> - DAPL_EVD *evd_ptr;
tduffy> -
tduffy> - hca_ptr = NULL;
tduffy> - ia_ptr = NULL;
tduffy> + struct dapl_hca *hca_ptr = NULL;
tduffy> + struct dapl_ia *ia_ptr = NULL;
tduffy> + struct dapl_evd *evd_ptr;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> "dapl_ia_open (%s, %d, %p, %p)\n",
tduffy> @@ -87,7 +84,7 @@ u32 dapl_ia_open(const char *name, int a
tduffy> /* initialize the caller's param */
tduffy> *ia_handle_ptr = DAT_HANDLE_NULL;
tduffy>
tduffy> - hca_ptr = (DAPL_HCA *) provider->extension;
tduffy> + hca_ptr = (struct dapl_hca *)provider->extension;
tduffy> atomic_inc(&hca_ptr->handle_ref_count);
tduffy>
tduffy> /* Allocate and initialize ia structure */
tduffy> @@ -103,7 +100,7 @@ u32 dapl_ia_open(const char *name, int a
tduffy> * use the one passed in (if non-NULL) or create one
tduffy> */
tduffy>
tduffy> - evd_ptr = (DAPL_EVD *) * async_evd_handle_ptr;
tduffy> + evd_ptr = (struct dapl_evd *)*async_evd_handle_ptr;
tduffy> if (evd_ptr) {
tduffy> if (DAPL_BAD_HANDLE(evd_ptr, DAPL_MAGIC_EVD) ||
tduffy> !(evd_ptr->evd_flags & DAT_EVD_ASYNC_FLAG)) {
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_util.c (working copy)
tduffy> @@ -41,7 +41,7 @@
tduffy>
tduffy> static inline void dapl_evd_eh_print_cqe(struct ib_wc *cqe);
tduffy>
tduffy> -u32 dapl_evd_event_alloc(DAPL_EVD *evd_ptr, int qlen);
tduffy> +u32 dapl_evd_event_alloc(struct dapl_evd *evd_ptr, int qlen);
tduffy>
tduffy> /*
tduffy> * actually create the evd. this is called after all parameter checking
tduffy> @@ -49,11 +49,11 @@ u32 dapl_evd_event_alloc(DAPL_EVD *evd_p
tduffy> * to create the default async evd.
tduffy> */
tduffy>
tduffy> -u32 dapl_evd_internal_create(DAPL_IA *ia_ptr, DAPL_CNO *cno_ptr,
tduffy> +u32 dapl_evd_internal_create(struct dapl_ia *ia_ptr, struct dapl_cno *cno_ptr,
tduffy> int min_qlen, enum dat_evd_flags evd_flags,
tduffy> - DAPL_EVD **evd_ptr_ptr)
tduffy> + struct dapl_evd **evd_ptr_ptr)
tduffy> {
tduffy> - DAPL_EVD *evd_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> int cq_len;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> @@ -117,10 +117,11 @@ bail:
tduffy> /*
tduffy> * alloc and initialize an EVD struct
tduffy> */
tduffy> -DAPL_EVD *dapl_evd_alloc(DAPL_IA * ia_ptr, DAPL_CNO * cno_ptr,
tduffy> - enum dat_evd_flags evd_flags, int qlen)
tduffy> +struct dapl_evd *dapl_evd_alloc(struct dapl_ia *ia_ptr,
tduffy> + struct dapl_cno *cno_ptr,
tduffy> + enum dat_evd_flags evd_flags, int qlen)
tduffy> {
tduffy> - DAPL_EVD *evd_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy>
tduffy> /* Allocate EVD */
tduffy> evd_ptr = kmalloc(sizeof *evd_ptr, GFP_ATOMIC);
tduffy> @@ -161,7 +162,7 @@ bail:
tduffy> /*
tduffy> * alloc events into an EVD.
tduffy> */
tduffy> -u32 dapl_evd_event_alloc(DAPL_EVD *evd_ptr, int qlen)
tduffy> +u32 dapl_evd_event_alloc(struct dapl_evd *evd_ptr, int qlen)
tduffy> {
tduffy> struct dat_event *event_ptr;
tduffy> int i;
tduffy> @@ -201,7 +202,7 @@ bail:
tduffy> /*
tduffy> * realloc events into an EVD.
tduffy> */
tduffy> -u32 dapl_evd_event_realloc(DAPL_EVD *evd_ptr, int qlen)
tduffy> +u32 dapl_evd_event_realloc(struct dapl_evd *evd_ptr, int qlen)
tduffy> {
tduffy> struct dat_event *events;
tduffy> int i, old_qlen, diff;
tduffy> @@ -251,10 +252,10 @@ bail:
tduffy> * will clean up all of the internal data structures and report the
tduffy> * error.
tduffy> */
tduffy> -u32 dapl_evd_dealloc(DAPL_EVD *evd_ptr)
tduffy> +u32 dapl_evd_dealloc(struct dapl_evd *evd_ptr)
tduffy> {
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy>
tduffy> dapl_os_assert(evd_ptr->header.magic == DAPL_MAGIC_EVD);
tduffy> dapl_os_assert(atomic_read(&evd_ptr->evd_ref_count) == 0);
tduffy> @@ -363,7 +364,7 @@ void dapl_evd_eh_print_cqe(struct ib_wc
tduffy> * that the lock is held.
tduffy> */
tduffy>
tduffy> -static struct dat_event *dapl_evd_get_event(DAPL_EVD * evd_ptr)
tduffy> +static struct dat_event *dapl_evd_get_event(struct dapl_evd *evd_ptr)
tduffy> {
tduffy> struct dat_event *event;
tduffy>
tduffy> @@ -389,11 +390,11 @@ static struct dat_event *dapl_evd_get_ev
tduffy> * entry to this function.
tduffy> */
tduffy>
tduffy> -static void dapl_evd_post_event(DAPL_EVD *evd_ptr,
tduffy> +static void dapl_evd_post_event(struct dapl_evd *evd_ptr,
tduffy> const struct dat_event *event_ptr)
tduffy> {
tduffy> u32 dat_status;
tduffy> - DAPL_CNO * cno_to_trigger = NULL;
tduffy> + struct dapl_cno *cno_to_trigger = NULL;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_EVD,
tduffy> "dapl_evd_post_event: Called with event # %x\n",
tduffy> @@ -420,10 +421,10 @@ static void dapl_evd_post_event(DAPL_EVD
tduffy> /*
tduffy> * format an overflow event for posting
tduffy> */
tduffy> -static void
tduffy> -dapl_evd_format_overflow_event(DAPL_EVD * evd_ptr, struct dat_event * event_ptr)
tduffy> +static void dapl_evd_format_overflow_event(struct dapl_evd *evd_ptr,
tduffy> + struct dat_event *event_ptr)
tduffy> {
tduffy> - DAPL_IA *ia_ptr;
tduffy> + struct dapl_ia *ia_ptr;
tduffy>
tduffy> ia_ptr = evd_ptr->header.owner_ia;
tduffy>
tduffy> @@ -436,9 +437,8 @@ dapl_evd_format_overflow_event(DAPL_EVD
tduffy> /*
tduffy> * post an overflow event
tduffy> */
tduffy> -static void
tduffy> -dapl_evd_post_overflow_event(DAPL_EVD * async_evd_ptr,
tduffy> - DAPL_EVD * overflow_evd_ptr)
tduffy> +static void dapl_evd_post_overflow_event(struct dapl_evd *async_evd_ptr,
tduffy> + struct dapl_evd *overflow_evd_ptr)
tduffy> {
tduffy> struct dat_event *overflow_event;
tduffy>
tduffy> @@ -464,7 +464,7 @@ dapl_evd_post_overflow_event(DAPL_EVD *
tduffy> return;
tduffy> }
tduffy>
tduffy> -static struct dat_event *dapl_evd_get_and_init_event(DAPL_EVD *evd_ptr,
tduffy> +static struct dat_event *dapl_evd_get_and_init_event(struct dapl_evd *evd_ptr,
tduffy> enum dat_event_number evno)
tduffy> {
tduffy> struct dat_event *event_ptr;
tduffy> @@ -481,7 +481,7 @@ static struct dat_event *dapl_evd_get_an
tduffy> return event_ptr;
tduffy> }
tduffy>
tduffy> -u32 dapl_evd_post_cr_arrival_event(DAPL_EVD *evd_ptr,
tduffy> +u32 dapl_evd_post_cr_arrival_event(struct dapl_evd *evd_ptr,
tduffy> DAT_SP_HANDLE sp_handle,
tduffy> struct sockaddr *ia_address_ptr,
tduffy> DAT_CONN_QUAL conn_qual,
tduffy> @@ -511,7 +511,7 @@ u32 dapl_evd_post_cr_arrival_event(DAPL_
tduffy> return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> -u32 dapl_evd_post_connection_event(DAPL_EVD *evd_ptr,
tduffy> +u32 dapl_evd_post_connection_event(struct dapl_evd *evd_ptr,
tduffy> enum dat_event_number event_number,
tduffy> DAT_EP_HANDLE ep_handle,
tduffy> int private_data_size,
tduffy> @@ -540,9 +540,9 @@ u32 dapl_evd_post_connection_event(DAPL_
tduffy> return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> -u32 dapl_evd_post_async_error_event(DAPL_EVD *evd_ptr,
tduffy> +u32 dapl_evd_post_async_error_event(struct dapl_evd *evd_ptr,
tduffy> enum dat_event_number event_number,
tduffy> - DAPL_IA *ia_ptr)
tduffy> + struct dapl_ia *ia_ptr)
tduffy> {
tduffy> struct dat_event *event_ptr;
tduffy> event_ptr = dapl_evd_get_and_init_event(evd_ptr, event_number);
tduffy> @@ -564,7 +564,7 @@ u32 dapl_evd_post_async_error_event(DAPL
tduffy> return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> -u32 dapl_evd_post_software_event(DAPL_EVD *evd_ptr,
tduffy> +u32 dapl_evd_post_software_event(struct dapl_evd *evd_ptr,
tduffy> enum dat_event_number event_number,
tduffy> void *pointer)
tduffy> {
tduffy> @@ -604,12 +604,12 @@ u32 dapl_evd_post_software_event(DAPL_EV
tduffy> * none
tduffy> *
tduffy> */
tduffy> -static void
tduffy> -dapl_evd_cqe_to_event(DAPL_EVD * evd_ptr, struct ib_wc *cqe_ptr,
tduffy> - struct dat_event *event_ptr)
tduffy> +static void dapl_evd_cqe_to_event(struct dapl_evd *evd_ptr,
tduffy> + struct ib_wc *cqe_ptr,
tduffy> + struct dat_event *event_ptr)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> - DAPL_COOKIE *cookie;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> + struct dapl_cookie *cookie;
tduffy> enum dat_dto_completion_status dto_status;
tduffy>
tduffy> /*
tduffy> @@ -618,7 +618,7 @@ dapl_evd_cqe_to_event(DAPL_EVD * evd_ptr
tduffy> */
tduffy> dto_status = dapl_ib_get_dto_status(cqe_ptr);
tduffy>
tduffy> - cookie = (DAPL_COOKIE *) (unsigned long) cqe_ptr->wr_id;
tduffy> + cookie = (struct dapl_cookie *) (unsigned long) cqe_ptr->wr_id;
tduffy> dapl_os_assert((NULL != cookie));
tduffy>
tduffy> ep_ptr = cookie->ep;
tduffy> @@ -633,7 +633,7 @@ dapl_evd_cqe_to_event(DAPL_EVD * evd_ptr
tduffy> switch (cookie->type) {
tduffy> case DAPL_COOKIE_TYPE_DTO:
tduffy> {
tduffy> - DAPL_COOKIE_BUFFER *buffer;
tduffy> + struct dapl_cookie_buffer *buffer;
tduffy>
tduffy> if (DAPL_DTO_TYPE_RECV == cookie->val.dto.type) {
tduffy> atomic_dec(&ep_ptr->recv_count);
tduffy> @@ -740,7 +740,7 @@ dapl_evd_cqe_to_event(DAPL_EVD * evd_ptr
tduffy> * Status of operation
tduffy> *
tduffy> */
tduffy> -u32 dapl_evd_cq_poll_to_event(DAPL_EVD *evd_ptr, struct dat_event *event)
tduffy> +u32 dapl_evd_cq_poll_to_event(struct dapl_evd *evd_ptr, struct dat_event *event)
tduffy> {
tduffy> u32 dat_status;
tduffy> struct ib_wc cur_cqe;
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_disconnect.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_disconnect.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_disconnect.c (working copy)
tduffy> @@ -66,16 +66,16 @@
tduffy> u32 dapl_ep_disconnect(DAT_EP_HANDLE ep_handle,
tduffy> enum dat_close_flags disconnect_flags)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> - DAPL_EVD *evd_ptr;
tduffy> - DAPL_CR *cr_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> + struct dapl_evd *evd_ptr;
tduffy> + struct dapl_cr *cr_ptr;
tduffy> u32 dat_status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API | DAPL_DBG_TYPE_CM,
tduffy> "dapl_ep_disconnect (%p, %x)\n",
tduffy> ep_handle, disconnect_flags);
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy>
tduffy> /*
tduffy> * Verify parameter & state
tduffy> @@ -144,7 +144,7 @@ u32 dapl_ep_disconnect(DAT_EP_HANDLE ep_
tduffy> /* clean up connection state */
tduffy> dapl_sp_remove_ep(ep_ptr);
tduffy>
tduffy> - evd_ptr = (DAPL_EVD *) ep_ptr->param.connect_evd_handle;
tduffy> + evd_ptr = (struct dapl_evd *)ep_ptr->param.connect_evd_handle;
tduffy> dapl_evd_post_connection_event(evd_ptr,
tduffy> DAT_CONNECTION_EVENT_DISCONNECTED,
tduffy> (DAT_HANDLE) ep_ptr, 0, NULL);
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_sp_util.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_sp_util.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_sp_util.c (working copy)
tduffy> @@ -59,13 +59,13 @@
tduffy> * pointer to sp info struct
tduffy> *
tduffy> */
tduffy> -DAPL_SP *dapl_sp_alloc(DAPL_IA * ia_ptr, boolean_t is_psp)
tduffy> +struct dapl_sp *dapl_sp_alloc(struct dapl_ia *ia_ptr, boolean_t is_psp)
tduffy> {
tduffy> - DAPL_SP *sp_ptr;
tduffy> + struct dapl_sp *sp_ptr;
tduffy>
tduffy> /* Allocate EP */
tduffy> sp_ptr = kmalloc(sizeof *sp_ptr, GFP_ATOMIC);
tduffy> - if (!sp_ptr)
tduffy> + if (!sp_ptr)
tduffy> return NULL;
tduffy>
tduffy> /* zero the structure */
tduffy> @@ -111,7 +111,7 @@ DAPL_SP *dapl_sp_alloc(DAPL_IA * ia_ptr,
tduffy> * none
tduffy> *
tduffy> */
tduffy> -void dapl_sp_dealloc(DAPL_SP * sp_ptr)
tduffy> +void dapl_sp_dealloc(struct dapl_sp *sp_ptr)
tduffy> {
tduffy> dapl_os_assert(sp_ptr->header.magic == DAPL_MAGIC_PSP ||
tduffy> sp_ptr->header.magic == DAPL_MAGIC_RSP);
tduffy> @@ -138,7 +138,7 @@ void dapl_sp_dealloc(DAPL_SP * sp_ptr)
tduffy> * none
tduffy> *
tduffy> */
tduffy> -void dapl_sp_link_cr(DAPL_SP *sp_ptr, DAPL_CR *cr_ptr)
tduffy> +void dapl_sp_link_cr(struct dapl_sp *sp_ptr, struct dapl_cr *cr_ptr)
tduffy> {
tduffy> spin_lock_irqsave(&sp_ptr->header.lock, sp_ptr->header.flags);
tduffy> dapl_llist_add_tail(&sp_ptr->cr_list_head,
tduffy> @@ -166,14 +166,15 @@ void dapl_sp_link_cr(DAPL_SP *sp_ptr, DA
tduffy> * cr_ptr Pointer to matching DAPL_CR
tduffy> *
tduffy> */
tduffy> -DAPL_CR *dapl_sp_search_cr(DAPL_SP * sp_ptr, struct dapl_cm_id *ib_cm_handle)
tduffy> +struct dapl_cr *dapl_sp_search_cr(struct dapl_sp *sp_ptr,
tduffy> + struct dapl_cm_id *ib_cm_handle)
tduffy> {
tduffy> - DAPL_CR *cr_ptr;
tduffy> + struct dapl_cr *cr_ptr;
tduffy>
tduffy> if (dapl_llist_is_empty(&sp_ptr->cr_list_head))
tduffy> return NULL;
tduffy>
tduffy> - cr_ptr = (DAPL_CR *) dapl_llist_peek_head(&sp_ptr->cr_list_head);
tduffy> + cr_ptr = (struct dapl_cr *)dapl_llist_peek_head(&sp_ptr->cr_list_head);
tduffy>
tduffy> do {
tduffy> if (cr_ptr->ib_cm_handle == ib_cm_handle)
tduffy> @@ -203,7 +204,7 @@ DAPL_CR *dapl_sp_search_cr(DAPL_SP * sp_
tduffy> * void
tduffy> *
tduffy> */
tduffy> -void dapl_sp_remove_cr(DAPL_SP * sp_ptr, DAPL_CR * cr_ptr)
tduffy> +void dapl_sp_remove_cr(struct dapl_sp *sp_ptr, struct dapl_cr *cr_ptr)
tduffy> {
tduffy> if (dapl_llist_is_empty(&sp_ptr->cr_list_head)) {
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_ERR,
tduffy> @@ -233,10 +234,10 @@ void dapl_sp_remove_cr(DAPL_SP * sp_ptr,
tduffy> * void
tduffy> *
tduffy> */
tduffy> -void dapl_sp_remove_ep(DAPL_EP * ep_ptr)
tduffy> +void dapl_sp_remove_ep(struct dapl_ep *ep_ptr)
tduffy> {
tduffy> - DAPL_SP *sp_ptr;
tduffy> - DAPL_CR *cr_ptr;
tduffy> + struct dapl_sp *sp_ptr;
tduffy> + struct dapl_cr *cr_ptr;
tduffy>
tduffy> cr_ptr = ep_ptr->cr_ptr;
tduffy>
tduffy> @@ -253,7 +254,5 @@ void dapl_sp_remove_ep(DAPL_EP * ep_ptr)
tduffy>
tduffy> /* free memory outside of the lock */
tduffy> dapl_cr_free(cr_ptr);
tduffy> -
tduffy> - return;
tduffy> }
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_evd_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_evd_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_evd_util.h (working copy)
tduffy> @@ -40,16 +40,17 @@
tduffy>
tduffy> #include "dapl.h"
tduffy>
tduffy> -u32 dapl_evd_internal_create(DAPL_IA *ia_ptr, DAPL_CNO *cno_ptr,
tduffy> +u32 dapl_evd_internal_create(struct dapl_ia *ia_ptr, struct dapl_cno *cno_ptr,
tduffy> int min_qlen, enum dat_evd_flags evd_flags,
tduffy> - DAPL_EVD **evd_ptr_ptr);
tduffy> + struct dapl_evd **evd_ptr_ptr);
tduffy>
tduffy> -DAPL_EVD *dapl_evd_alloc(DAPL_IA * ia_ptr, DAPL_CNO * cno_ptr,
tduffy> - enum dat_evd_flags evd_flags, int qlen);
tduffy> +struct dapl_evd *dapl_evd_alloc(struct dapl_ia *ia_ptr,
tduffy> + struct dapl_cno *cno_ptr,
tduffy> + enum dat_evd_flags evd_flags, int qlen);
tduffy>
tduffy> -u32 dapl_evd_dealloc(DAPL_EVD *evd_ptr);
tduffy> +u32 dapl_evd_dealloc(struct dapl_evd *evd_ptr);
tduffy>
tduffy> -u32 dapl_evd_event_realloc(DAPL_EVD *evd_ptr, int qlen);
tduffy> +u32 dapl_evd_event_realloc(struct dapl_evd *evd_ptr, int qlen);
tduffy>
tduffy> /*
tduffy> * Each of these functions will retrieve a free event from
tduffy> @@ -62,23 +63,23 @@ u32 dapl_evd_event_realloc(DAPL_EVD *evd
tduffy> * DAT_SUCCESS otherwise.
tduffy> */
tduffy>
tduffy> -u32 dapl_evd_post_cr_arrival_event(DAPL_EVD *evd_ptr,
tduffy> +u32 dapl_evd_post_cr_arrival_event(struct dapl_evd *evd_ptr,
tduffy> DAT_SP_HANDLE sp_handle,
tduffy> struct sockaddr *ia_address_ptr,
tduffy> DAT_CONN_QUAL conn_qual,
tduffy> DAT_CR_HANDLE cr_handle);
tduffy>
tduffy> -u32 dapl_evd_post_connection_event(DAPL_EVD *evd_ptr,
tduffy> +u32 dapl_evd_post_connection_event(struct dapl_evd *evd_ptr,
tduffy> enum dat_event_number event_number,
tduffy> DAT_EP_HANDLE ep_handle,
tduffy> int private_data_size,
tduffy> void *private_data);
tduffy>
tduffy> -u32 dapl_evd_post_async_error_event(DAPL_EVD *evd_ptr,
tduffy> +u32 dapl_evd_post_async_error_event(struct dapl_evd *evd_ptr,
tduffy> enum dat_event_number event_number,
tduffy> - DAPL_IA *ia_ptr);
tduffy> + struct dapl_ia *ia_ptr);
tduffy>
tduffy> -u32 dapl_evd_post_software_event(DAPL_EVD *evd_ptr,
tduffy> +u32 dapl_evd_post_software_event(struct dapl_evd *evd_ptr,
tduffy> enum dat_event_number event_number,
tduffy> void *pointer);
tduffy>
tduffy> @@ -105,7 +106,7 @@ extern void dapl_evd_cq_async_error_call
tduffy> extern void dapl_evd_qp_async_error_callback(struct ib_event *cause_ptr,
tduffy> void *context);
tduffy>
tduffy> -extern u32 dapl_evd_cq_poll_to_event(DAPL_EVD *evd_ptr,
tduffy> +extern u32 dapl_evd_cq_poll_to_event(struct dapl_evd *evd_ptr,
tduffy> struct dat_event *event);
tduffy>
tduffy> #endif
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_hash.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_hash.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_hash.c (working copy)
tduffy> @@ -161,7 +161,7 @@ dapl_hash_rehash(DAPL_HASH_ELEM * elemen
tduffy> * TRUE on success
tduffy> */
tduffy> static boolean_t
tduffy> -dapl_hash_add(DAPL_HASH_TABLEP p_table, DAPL_HASH_KEY key, void *datum,
tduffy> +dapl_hash_add(struct dapl_hash_table *table, DAPL_HASH_KEY key, void *datum,
tduffy> boolean_t allow_dup, boolean_t *report_dup)
tduffy> {
tduffy> void *olddatum;
tduffy> @@ -184,7 +184,7 @@ dapl_hash_add(DAPL_HASH_TABLEP p_table,
tduffy> return FALSE;
tduffy> }
tduffy>
tduffy> - DAPL_HASHLOOKUP(p_table, key, olddatum, found);
tduffy> + DAPL_HASHLOOKUP(table, key, olddatum, found);
tduffy> if (found) {
tduffy> /*
tduffy> * key exists already
tduffy> @@ -201,16 +201,16 @@ dapl_hash_add(DAPL_HASH_TABLEP p_table,
tduffy> }
tduffy> }
tduffy>
tduffy> - hashValue = DAPL_DOHASH(key, p_table->tbl_size);
tduffy> + hashValue = DAPL_DOHASH(key, table->tbl_size);
tduffy> key = save_key;
tduffy> - if (NO_DATUM(p_table->table[hashValue].datum)) {
tduffy> + if (NO_DATUM(table->table[hashValue].datum)) {
tduffy> /*
tduffy> * Empty head - just fill it in
tduffy> */
tduffy> - p_table->table[hashValue].key = key;
tduffy> - p_table->table[hashValue].datum = datum;
tduffy> - p_table->table[hashValue].next_element = NULL;
tduffy> - p_table->num_entries++;
tduffy> + table->table[hashValue].key = key;
tduffy> + table->table[hashValue].datum = datum;
tduffy> + table->table[hashValue].next_element = NULL;
tduffy> + table->num_entries++;
tduffy> status = TRUE;
tduffy> } else {
tduffy> DAPL_HASH_ELEM *newelement = kmalloc(sizeof *newelement,
tduffy> @@ -223,14 +223,14 @@ dapl_hash_add(DAPL_HASH_TABLEP p_table,
tduffy> newelement->key = key;
tduffy> newelement->datum = datum;
tduffy> newelement->next_element = NULL;
tduffy> - for (lastelement = &p_table->table[hashValue];
tduffy> + for (lastelement = &table->table[hashValue];
tduffy> lastelement->next_element;
tduffy> lastelement = lastelement->next_element) {
tduffy> /* Walk to the end of the chain */
tduffy> chain_len++;
tduffy> }
tduffy> lastelement->next_element = newelement;
tduffy> - p_table->num_entries++;
tduffy> + table->num_entries++;
tduffy> status = TRUE;
tduffy> } else
tduffy> status = FALSE;
tduffy> @@ -241,14 +241,14 @@ dapl_hash_add(DAPL_HASH_TABLEP p_table,
tduffy> * length.
tduffy> */
tduffy> chain_len++;
tduffy> - p_table->hash_tbl_inserts++;
tduffy> - p_table->hash_tbl_total += p_table->num_entries;
tduffy> - p_table->hash_chn_total += chain_len;
tduffy> - if (p_table->num_entries > p_table->hash_tbl_max) {
tduffy> - p_table->hash_tbl_max = p_table->num_entries;
tduffy> + table->hash_tbl_inserts++;
tduffy> + table->hash_tbl_total += table->num_entries;
tduffy> + table->hash_chn_total += chain_len;
tduffy> + if (table->num_entries > table->hash_tbl_max) {
tduffy> + table->hash_tbl_max = table->num_entries;
tduffy> }
tduffy> - if (chain_len > p_table->hash_chn_max) {
tduffy> - p_table->hash_chn_max = chain_len;
tduffy> + if (chain_len > table->hash_chn_max) {
tduffy> + table->hash_chn_max = chain_len;
tduffy> }
tduffy>
tduffy> return status;
tduffy> @@ -319,9 +319,9 @@ dapl_hash_delete_element(DAPL_HASH_ELEM
tduffy> /*
tduffy> * Create a new hash table with at least 'table_size' hash buckets.
tduffy> */
tduffy> -u32 dapl_hash_create(int table_size, DAPL_HASH_TABLE **pp_table)
tduffy> +u32 dapl_hash_create(int table_size, struct dapl_hash_table **pp_table)
tduffy> {
tduffy> - DAPL_HASH_TABLE *p_table;
tduffy> + struct dapl_hash_table *p_table;
tduffy> int table_length = table_size * sizeof (struct DAPL_HASH_ELEM);
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> int i;
tduffy> @@ -356,14 +356,14 @@ u32 dapl_hash_create(int table_size, DAP
tduffy>
tduffy> *pp_table = p_table;
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return DAT_SUCCESS;
tduffy> }
tduffy>
tduffy> /*
tduffy> * Destroy a hash table
tduffy> */
tduffy> -u32 dapl_hash_free(DAPL_HASH_TABLE *p_table)
tduffy> +u32 dapl_hash_free(struct dapl_hash_table *p_table)
tduffy> {
tduffy> dapl_os_assert(p_table && p_table->table);
tduffy>
tduffy> @@ -378,7 +378,7 @@ u32 dapl_hash_free(DAPL_HASH_TABLE *p_ta
tduffy> * Returns the number of elements stored in the table
tduffy> */
tduffy>
tduffy> -u32 dapl_hash_size(DAPL_HASH_TABLE *p_table, int *p_size)
tduffy> +u32 dapl_hash_size(struct dapl_hash_table *p_table, int *p_size)
tduffy> {
tduffy> dapl_os_assert(p_table && p_size);
tduffy>
tduffy> @@ -392,7 +392,7 @@ u32 dapl_hash_size(DAPL_HASH_TABLE *p_ta
tduffy> * Duplicates are not expected, and return in error, having done nothing.
tduffy> */
tduffy>
tduffy> -u32 dapl_hash_insert(DAPL_HASH_TABLE *p_table, DAPL_HASH_KEY key,
tduffy> +u32 dapl_hash_insert(struct dapl_hash_table *p_table, DAPL_HASH_KEY key,
tduffy> DAPL_HASH_DATA data)
tduffy> {
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> @@ -415,7 +415,7 @@ u32 dapl_hash_insert(DAPL_HASH_TABLE *p_
tduffy> * data is returned in the DAPL_HASH_DATA
tduffy> * pointer if that pointer is not NULL.
tduffy> */
tduffy> -u32 dapl_hash_search(DAPL_HASH_TABLE *p_table, DAPL_HASH_KEY key,
tduffy> +u32 dapl_hash_search(struct dapl_hash_table *p_table, DAPL_HASH_KEY key,
tduffy> DAPL_HASH_DATA *p_data)
tduffy> {
tduffy> u32 dat_status;
tduffy> @@ -439,7 +439,7 @@ u32 dapl_hash_search(DAPL_HASH_TABLE *p_
tduffy> return dat_status;
tduffy> }
tduffy>
tduffy> -u32 dapl_hash_remove(DAPL_HASH_TABLE *p_table, DAPL_HASH_KEY key,
tduffy> +u32 dapl_hash_remove(struct dapl_hash_table *p_table, DAPL_HASH_KEY key,
tduffy> DAPL_HASH_DATA *p_data)
tduffy> {
tduffy> u32 dat_status;
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_sp_util.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_sp_util.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_sp_util.h (working copy)
tduffy> @@ -37,16 +37,17 @@
tduffy> #ifndef DAPL_PSP_UTIL_H
tduffy> #define DAPL_PSP_UTIL_H
tduffy>
tduffy> -DAPL_SP *dapl_sp_alloc(DAPL_IA * ia_ptr, boolean_t is_psp);
tduffy> +struct dapl_sp *dapl_sp_alloc(struct dapl_ia *ia_ptr, boolean_t is_psp);
tduffy>
tduffy> -void dapl_sp_dealloc(DAPL_SP * sp_ptr);
tduffy> +void dapl_sp_dealloc(struct dapl_sp *sp_ptr);
tduffy>
tduffy> -void dapl_sp_link_cr(DAPL_SP * sp_ptr, DAPL_CR * cr_ptr);
tduffy> +void dapl_sp_link_cr(struct dapl_sp *sp_ptr, struct dapl_cr *cr_ptr);
tduffy>
tduffy> -DAPL_CR *dapl_sp_search_cr(DAPL_SP * sp_ptr, struct dapl_cm_id *ib_cm_handle);
tduffy> +struct dapl_cr *dapl_sp_search_cr(struct dapl_sp *sp_ptr,
tduffy> + struct dapl_cm_id *ib_cm_handle);
tduffy>
tduffy> -void dapl_sp_remove_cr(DAPL_SP * sp_ptr, DAPL_CR * cr_ptr);
tduffy> +void dapl_sp_remove_cr(struct dapl_sp *sp_ptr, struct dapl_cr *cr_ptr);
tduffy>
tduffy> -void dapl_sp_remove_ep(DAPL_EP * ep_ptr);
tduffy> +void dapl_sp_remove_ep(struct dapl_ep *ep_ptr);
tduffy>
tduffy> -#endif /* DAPL_PSP_UTIL_H */
tduffy> +#endif /* DAPL_PSP_UTIL_H */
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_dup_connect.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_dup_connect.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_dup_connect.c (working copy)
tduffy> @@ -73,12 +73,12 @@ u32 dapl_ep_dup_connect(DAT_EP_HANDLE ep
tduffy> DAT_TIMEOUT timeout, int private_data_size,
tduffy> const void *private_data, enum dat_qos qos)
tduffy> {
tduffy> - DAPL_EP *ep_dup_ptr;
tduffy> + struct dapl_ep *ep_dup_ptr;
tduffy> struct sockaddr *remote_ia_address_ptr;
tduffy> DAT_CONN_QUAL remote_conn_qual;
tduffy> u32 dat_status;
tduffy>
tduffy> - ep_dup_ptr = (DAPL_EP *) ep_dup_handle;
tduffy> + ep_dup_ptr = (struct dapl_ep *)ep_dup_handle;
tduffy>
tduffy> /*
tduffy> * Verify the dup handle, which must be connected. All other
tduffy> Index: linux-kernel-resolv/dat-provider/dapl.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl.h (working copy)
tduffy> @@ -123,7 +123,7 @@ typedef enum dapl_evd_completion {
tduffy> #define DAPL_BAD_HANDLE(h, magicNum) ( \
tduffy> ((h) == NULL) || \
tduffy> ((unsigned long)(h) & 3) || \
tduffy> - (((DAPL_HEADER *)(h))->magic != (magicNum)))
tduffy> + (((struct dapl_header *)(h))->magic != (magicNum)))
tduffy>
tduffy> #define DAPL_MIN(a, b) ((a < b) ? (a) : (b))
tduffy> #define DAPL_MAX(a, b) ((a > b) ? (a) : (b))
tduffy> @@ -158,35 +158,9 @@ typedef struct ib_hca_transport {
tduffy> u16 lid;
tduffy> } ib_hca_transport_t;
tduffy>
tduffy> -typedef struct dapl_llist_entry DAPL_LLIST_ENTRY;
tduffy> -typedef DAPL_LLIST_ENTRY *DAPL_LLIST_HEAD;
tduffy> -typedef struct dapl_ring_buffer DAPL_RING_BUFFER;
tduffy> -typedef struct dapl_cookie_buffer DAPL_COOKIE_BUFFER;
tduffy> -
tduffy> -typedef struct dapl_hash_table DAPL_HASH_TABLE;
tduffy> -typedef struct dapl_hash_table *DAPL_HASH_TABLEP;
tduffy> typedef u64 DAPL_HASH_KEY;
tduffy> typedef void *DAPL_HASH_DATA;
tduffy>
tduffy> -typedef struct dapl_hca DAPL_HCA;
tduffy> -
tduffy> -typedef struct dapl_header DAPL_HEADER;
tduffy> -
tduffy> -typedef struct dapl_ia DAPL_IA;
tduffy> -typedef struct dapl_cno DAPL_CNO;
tduffy> -typedef struct dapl_evd DAPL_EVD;
tduffy> -typedef struct dapl_ep DAPL_EP;
tduffy> -typedef struct dapl_srq DAPL_SRQ;
tduffy> -typedef struct dapl_pz DAPL_PZ;
tduffy> -typedef struct dapl_lmr DAPL_LMR;
tduffy> -typedef struct dapl_rmr DAPL_RMR;
tduffy> -typedef struct dapl_sp DAPL_SP;
tduffy> -typedef struct dapl_cr DAPL_CR;
tduffy> -
tduffy> -typedef struct dapl_cookie DAPL_COOKIE;
tduffy> -typedef struct dapl_dto_cookie DAPL_DTO_COOKIE;
tduffy> -typedef struct dapl_rmr_cookie DAPL_RMR_COOKIE;
tduffy> -
tduffy> /*********************************************************************
tduffy> * *
tduffy> * Structures *
tduffy> @@ -197,7 +171,7 @@ struct dapl_llist_entry {
tduffy> struct dapl_llist_entry *flink;
tduffy> struct dapl_llist_entry *blink;
tduffy> void *data;
tduffy> - DAPL_LLIST_HEAD *list_head; /* for consistency checking */
tduffy> + struct dapl_llist_entry **list_head; /* for consistency checking */
tduffy> };
tduffy>
tduffy> struct dapl_ring_buffer {
tduffy> @@ -208,7 +182,7 @@ struct dapl_ring_buffer {
tduffy> };
tduffy>
tduffy> struct dapl_cookie_buffer {
tduffy> - DAPL_COOKIE *pool;
tduffy> + struct dapl_cookie *pool;
tduffy> int pool_size;
tduffy> atomic_t head;
tduffy> atomic_t tail;
tduffy> @@ -217,7 +191,7 @@ struct dapl_cookie_buffer {
tduffy> struct dapl_hca {
tduffy> spinlock_t lock;
tduffy> unsigned long flags;
tduffy> - DAPL_LLIST_HEAD ia_list_head; /* list of all open IAs */
tduffy> + struct dapl_llist_entry *ia_list_head; /* list of all open IAs */
tduffy> atomic_t handle_ref_count; /* count of ia_opens on handle */
tduffy> struct sockaddr_in6 hca_address; /* local address of HCA */
tduffy> char *name; /* provider name */
tduffy> @@ -225,7 +199,7 @@ struct dapl_hca {
tduffy> u8 port_num; /* number of physical port */
tduffy> ib_hca_transport_t ib_trans; /* Values specific transport API */
tduffy> /* Memory Subsystem Support */
tduffy> - DAPL_HASH_TABLE *lmr_hash_table;
tduffy> + struct dapl_hash_table *lmr_hash_table;
tduffy> /* Limits & useful HCA attributes */
tduffy> struct dat_ia_attr ia_attr;
tduffy> struct dat_ep_attr ep_attr;
tduffy> @@ -236,8 +210,8 @@ struct dapl_header {
tduffy> struct dat_provider *provider; /* required by DAT - must be first */
tduffy> DAPL_MAGIC magic; /* magic number for verification */
tduffy> enum dat_handle_type handle_type; /* struct type */
tduffy> - DAPL_IA *owner_ia; /* ia which owns this stuct */
tduffy> - DAPL_LLIST_ENTRY ia_list_entry; /* link entry on ia struct */
tduffy> + struct dapl_ia *owner_ia; /* ia which owns this struct */
tduffy> + struct dapl_llist_entry ia_list_entry; /* link entry on ia struct */
tduffy> DAT_CONTEXT user_context; /* user context - opaque to DAPL */
tduffy> spinlock_t lock; /* lock - in header for easier macros */
tduffy> unsigned long flags; /* saved lock flag values */
tduffy> @@ -245,32 +219,32 @@ struct dapl_header {
tduffy>
tduffy> /* DAPL_IA maps to DAT_IA_HANDLE */
tduffy> struct dapl_ia {
tduffy> - DAPL_HEADER header;
tduffy> - DAPL_HCA *hca_ptr;
tduffy> - DAPL_EVD *async_error_evd;
tduffy> + struct dapl_header header; /* WARNING: must be first */
tduffy> + struct dapl_hca *hca_ptr;
tduffy> + struct dapl_evd *async_error_evd;
tduffy> boolean_t cleanup_async_error_evd;
tduffy>
tduffy> - DAPL_LLIST_ENTRY hca_ia_list_entry; /* HCAs list of IAs */
tduffy> - DAPL_LLIST_HEAD ep_list_head; /* EP queue */
tduffy> - DAPL_LLIST_HEAD lmr_list_head; /* LMR queue */
tduffy> - DAPL_LLIST_HEAD rmr_list_head; /* RMR queue */
tduffy> - DAPL_LLIST_HEAD pz_list_head; /* PZ queue */
tduffy> - DAPL_LLIST_HEAD evd_list_head; /* EVD queue */
tduffy> - DAPL_LLIST_HEAD psp_list_head; /* PSP queue */
tduffy> - DAPL_LLIST_HEAD rsp_list_head; /* RSP queue */
tduffy> - DAPL_LLIST_HEAD srq_list_head; /* SRQ queue */
tduffy> + struct dapl_llist_entry hca_ia_list_entry; /* HCAs list of IAs */
tduffy> + struct dapl_llist_entry *ep_list_head; /* EP queue */
tduffy> + struct dapl_llist_entry *lmr_list_head; /* LMR queue */
tduffy> + struct dapl_llist_entry *rmr_list_head; /* RMR queue */
tduffy> + struct dapl_llist_entry *pz_list_head; /* PZ queue */
tduffy> + struct dapl_llist_entry *evd_list_head; /* EVD queue */
tduffy> + struct dapl_llist_entry *psp_list_head; /* PSP queue */
tduffy> + struct dapl_llist_entry *rsp_list_head; /* RSP queue */
tduffy> + struct dapl_llist_entry *srq_list_head; /* SRQ queue */
tduffy> };
tduffy>
tduffy> /* DAPL_CNO maps to DAT_CNO_HANDLE */
tduffy> struct dapl_cno {
tduffy> - DAPL_HEADER header;
tduffy> + struct dapl_header header; /* WARNING: must be first */
tduffy> struct dat_upcall_object cno_upcall;
tduffy> enum dat_upcall_policy cno_upcall_policy;
tduffy> };
tduffy>
tduffy> /* DAPL_EVD maps to DAT_EVD_HANDLE */
tduffy> struct dapl_evd {
tduffy> - DAPL_HEADER header;
tduffy> + struct dapl_header header; /* WARNING: must be first */
tduffy> DAPL_EVD_STATE evd_state;
tduffy> enum dat_evd_flags evd_flags;
tduffy>
tduffy> @@ -292,22 +266,22 @@ struct dapl_evd {
tduffy> /* the actual events */
tduffy> int qlen;
tduffy> struct dat_event *events;
tduffy> - DAPL_RING_BUFFER free_event_queue;
tduffy> - DAPL_RING_BUFFER pending_event_queue;
tduffy> - DAPL_CNO *cno_ptr;
tduffy> + struct dapl_ring_buffer free_event_queue;
tduffy> + struct dapl_ring_buffer pending_event_queue;
tduffy> + struct dapl_cno *cno_ptr;
tduffy> };
tduffy>
tduffy> /* uDAPL timer entry, used to queue timeouts */
tduffy> struct dapl_timer_entry {
tduffy> - DAPL_LLIST_ENTRY list_entry; /* link entry on ia struct */
tduffy> + struct dapl_llist_entry list_entry; /* link entry on ia struct */
tduffy> DAPL_OS_TIMEVAL expires;
tduffy> void (*function) (void *);
tduffy> void *data;
tduffy> };
tduffy>
tduffy> -/* DAPL_EP maps to DAT_EP_HANDLE */
tduffy> +/* struct dapl_ep maps to DAT_EP_HANDLE */
tduffy> struct dapl_ep {
tduffy> - DAPL_HEADER header;
tduffy> + struct dapl_header header; /* WARNING: must be first */
tduffy> /* What the DAT Consumer asked for */
tduffy> struct dat_ep_param param;
tduffy>
tduffy> @@ -336,8 +310,8 @@ struct dapl_ep {
tduffy> atomic_t req_count;
tduffy> atomic_t recv_count;
tduffy>
tduffy> - DAPL_COOKIE_BUFFER req_buffer;
tduffy> - DAPL_COOKIE_BUFFER recv_buffer;
tduffy> + struct dapl_cookie_buffer req_buffer;
tduffy> + struct dapl_cookie_buffer recv_buffer;
tduffy>
tduffy> struct ib_sge *recv_iov;
tduffy> int recv_iov_num;
tduffy> @@ -346,37 +320,37 @@ struct dapl_ep {
tduffy> int send_iov_num;
tduffy> };
tduffy>
tduffy> -/* DAPL_SRQ maps to DAT_SRQ_HANDLE */
tduffy> +/* struct dapl_srq maps to DAT_SRQ_HANDLE */
tduffy> struct dapl_srq {
tduffy> - DAPL_HEADER header;
tduffy> + struct dapl_header header; /* WARNING: must be first */
tduffy> struct dat_srq_param param;
tduffy> atomic_t srq_ref_count;
tduffy> - DAPL_COOKIE_BUFFER recv_buffer;
tduffy> + struct dapl_cookie_buffer recv_buffer;
tduffy> atomic_t recv_count;
tduffy> };
tduffy>
tduffy> -/* DAPL_PZ maps to DAT_PZ_HANDLE */
tduffy> +/* struct dapl_pz maps to DAT_PZ_HANDLE */
tduffy> struct dapl_pz {
tduffy> - DAPL_HEADER header;
tduffy> + struct dapl_header header; /* WARNING: must be first */
tduffy> struct ib_pd *pd_handle;
tduffy> atomic_t pz_ref_count;
tduffy> };
tduffy>
tduffy> -/* DAPL_LMR maps to DAT_LMR_HANDLE */
tduffy> +/* struct dapl_lmr maps to DAT_LMR_HANDLE */
tduffy> struct dapl_lmr {
tduffy> - DAPL_HEADER header;
tduffy> + struct dapl_header header; /* WARNING: must be first */
tduffy> struct dat_lmr_param param;
tduffy> struct ib_mr *mr_handle;
tduffy> atomic_t lmr_ref_count;
tduffy> };
tduffy>
tduffy> -/* DAPL_RMR maps to DAT_RMR_HANDLE */
tduffy> +/* struct dapl_rmr maps to DAT_RMR_HANDLE */
tduffy> struct dapl_rmr {
tduffy> - DAPL_HEADER header;
tduffy> + struct dapl_header header; /* WARNING: must be first */
tduffy> struct dat_rmr_param param;
tduffy> - DAPL_EP *ep;
tduffy> - DAPL_PZ *pz;
tduffy> - DAPL_LMR *lmr;
tduffy> + struct dapl_ep *ep;
tduffy> + struct dapl_pz *pz;
tduffy> + struct dapl_lmr *lmr;
tduffy> struct ib_mw *mw_handle;
tduffy> };
tduffy>
tduffy> @@ -389,9 +363,9 @@ typedef enum dapl_sp_state {
tduffy> DAPL_SP_STATE_RSP_PENDING
tduffy> } DAPL_SP_STATE;
tduffy>
tduffy> -/* DAPL_SP maps to DAT_PSP_HANDLE and DAT_RSP_HANDLE */
tduffy> +/* struct dapl_sp maps to DAT_PSP_HANDLE and DAT_RSP_HANDLE */
tduffy> struct dapl_sp {
tduffy> - DAPL_HEADER header;
tduffy> + struct dapl_header header; /* WARNING: must be first */
tduffy> DAPL_SP_STATE state; /* type and queue of the SP */
tduffy>
tduffy> /* PSP/RSP PARAM fields */
tduffy> @@ -404,13 +378,13 @@ struct dapl_sp {
tduffy> /* maintenence fields */
tduffy> boolean_t listening; /* PSP is registered & active */
tduffy> struct ib_cm_id *cm_srvc_handle; /* Used by CM */
tduffy> - DAPL_LLIST_HEAD cr_list_head; /* CR pending queue */
tduffy> + struct dapl_llist_entry *cr_list_head; /* CR pending queue */
tduffy> int cr_list_count; /* count of CRs on queue */
tduffy> };
tduffy>
tduffy> -/* DAPL_CR maps to DAT_CR_HANDLE */
tduffy> +/* struct dapl_cr maps to DAT_CR_HANDLE */
tduffy> struct dapl_cr {
tduffy> - DAPL_HEADER header;
tduffy> + struct dapl_header header; /* WARNING: must be first */
tduffy>
tduffy> /* for convenience the data is kept as a struct dat_cr_param.
tduffy> * however, the "local_endpoint" field is always NULL
tduffy> @@ -430,7 +404,7 @@ struct dapl_cr {
tduffy> * Need to be able to associate the CR back to the PSP for
tduffy> * dapl_cr_reject.
tduffy> */
tduffy> - DAPL_SP *sp_ptr;
tduffy> + struct dapl_sp *sp_ptr;
tduffy> };
tduffy>
tduffy> typedef enum dapl_dto_type {
tduffy> @@ -446,27 +420,27 @@ typedef enum dapl_cookie_type {
tduffy> DAPL_COOKIE_TYPE_RMR,
tduffy> } DAPL_COOKIE_TYPE;
tduffy>
tduffy> -/* DAPL_DTO_COOKIE used as context for DTO WQEs */
tduffy> +/* struct dapl_dto_cookie used as context for DTO WQEs */
tduffy> struct dapl_dto_cookie {
tduffy> DAPL_DTO_TYPE type;
tduffy> DAT_DTO_COOKIE cookie;
tduffy> int size; /* used for SEND and RDMA write */
tduffy> };
tduffy>
tduffy> -/* DAPL_RMR_COOKIE used as context for bind WQEs */
tduffy> +/* struct dapl_rmr_cookie used as context for bind WQEs */
tduffy> struct dapl_rmr_cookie {
tduffy> - DAPL_RMR *rmr;
tduffy> + struct dapl_rmr *rmr;
tduffy> DAT_RMR_COOKIE cookie;
tduffy> };
tduffy>
tduffy> -/* DAPL_COOKIE used as context for WQEs */
tduffy> +/* struct dapl_cookie used as context for WQEs */
tduffy> struct dapl_cookie {
tduffy> DAPL_COOKIE_TYPE type; /* Must be first, to define struct. */
tduffy> - DAPL_EP *ep;
tduffy> + struct dapl_ep *ep;
tduffy> int index;
tduffy> union {
tduffy> - DAPL_DTO_COOKIE dto;
tduffy> - DAPL_RMR_COOKIE rmr;
tduffy> + struct dapl_dto_cookie dto;
tduffy> + struct dapl_rmr_cookie rmr;
tduffy> } val;
tduffy> };
tduffy>
tduffy> @@ -737,34 +711,35 @@ extern u32 dapl_srq_set_lw(DAT_SRQ_HANDL
tduffy> * DAPL internal utility function prototpyes
tduffy> */
tduffy>
tduffy> -extern void dapl_llist_init_head(DAPL_LLIST_HEAD * head);
tduffy> +extern void dapl_llist_init_head(struct dapl_llist_entry **head);
tduffy>
tduffy> -extern void dapl_llist_init_entry(DAPL_LLIST_ENTRY * entry);
tduffy> +extern void dapl_llist_init_entry(struct dapl_llist_entry *entry);
tduffy>
tduffy> -extern boolean_t dapl_llist_is_empty(DAPL_LLIST_HEAD * head);
tduffy> +extern boolean_t dapl_llist_is_empty(struct dapl_llist_entry **head);
tduffy>
tduffy> -extern void dapl_llist_add_head(DAPL_LLIST_HEAD * head,
tduffy> - DAPL_LLIST_ENTRY * entry, void *data);
tduffy> +extern void dapl_llist_add_head(struct dapl_llist_entry **head,
tduffy> + struct dapl_llist_entry *entry, void *data);
tduffy>
tduffy> -extern void dapl_llist_add_tail(DAPL_LLIST_HEAD * head,
tduffy> - DAPL_LLIST_ENTRY * entry, void *data);
tduffy> +extern void dapl_llist_add_tail(struct dapl_llist_entry **head,
tduffy> + struct dapl_llist_entry *entry, void *data);
tduffy>
tduffy> -extern void dapl_llist_add_entry(DAPL_LLIST_HEAD * head,
tduffy> - DAPL_LLIST_ENTRY * entry,
tduffy> - DAPL_LLIST_ENTRY * new_entry, void *data);
tduffy> +extern void dapl_llist_add_entry(struct dapl_llist_entry **head,
tduffy> + struct dapl_llist_entry *entry,
tduffy> + struct dapl_llist_entry *new_entry,
tduffy> + void *data);
tduffy>
tduffy> -extern void *dapl_llist_remove_head(DAPL_LLIST_HEAD * head);
tduffy> +extern void *dapl_llist_remove_head(struct dapl_llist_entry **head);
tduffy>
tduffy> -extern void *dapl_llist_remove_tail(DAPL_LLIST_HEAD * head);
tduffy> +extern void *dapl_llist_remove_tail(struct dapl_llist_entry **head);
tduffy>
tduffy> -extern void *dapl_llist_remove_entry(DAPL_LLIST_HEAD * head,
tduffy> - DAPL_LLIST_ENTRY * entry);
tduffy> +extern void *dapl_llist_remove_entry(struct dapl_llist_entry **head,
tduffy> + struct dapl_llist_entry *entry);
tduffy>
tduffy> -extern void *dapl_llist_peek_head(DAPL_LLIST_HEAD * head);
tduffy> +extern void *dapl_llist_peek_head(struct dapl_llist_entry **head);
tduffy>
tduffy> -extern void *dapl_llist_next_entry(DAPL_LLIST_HEAD * head,
tduffy> - DAPL_LLIST_ENTRY * cur_ent);
tduffy> +extern void *dapl_llist_next_entry(struct dapl_llist_entry **head,
tduffy> + struct dapl_llist_entry *cur_ent);
tduffy>
tduffy> -extern void dapl_llist_debug_print_list(DAPL_LLIST_HEAD * head);
tduffy> +extern void dapl_llist_debug_print_list(struct dapl_llist_entry **head);
tduffy>
tduffy> #endif
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_psp_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_psp_query.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_psp_query.c (working copy)
tduffy> @@ -40,11 +40,11 @@
tduffy>
tduffy> u32 dapl_psp_query(DAT_PSP_HANDLE psp_handle, struct dat_psp_param *psp_param)
tduffy> {
tduffy> - DAPL_SP *sp_ptr;
tduffy> + struct dapl_sp *sp_ptr;
tduffy> u32 status;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(psp_handle, DAPL_MAGIC_PSP) ||
tduffy> - ((DAPL_SP *) psp_handle)->listening != TRUE) {
tduffy> + ((struct dapl_sp *)psp_handle)->listening != TRUE) {
tduffy> status =
tduffy> DAT_ERROR(DAT_INVALID_HANDLE, DAT_INVALID_HANDLE_PSP);
tduffy> goto bail;
tduffy> @@ -55,7 +55,7 @@ u32 dapl_psp_query(DAT_PSP_HANDLE psp_ha
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - sp_ptr = (DAPL_SP *) psp_handle;
tduffy> + sp_ptr = (struct dapl_sp *)psp_handle;
tduffy>
tduffy> psp_param->ia_handle = sp_ptr->ia_handle;
tduffy> psp_param->conn_qual = sp_ptr->conn_qual;
tduffy> @@ -64,6 +64,6 @@ u32 dapl_psp_query(DAT_PSP_HANDLE psp_ha
tduffy>
tduffy> status = DAT_SUCCESS;
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_llist.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_llist.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_llist.c (working copy)
tduffy> @@ -57,7 +57,7 @@
tduffy> *
tduffy> * Purpose: initialize a linked list head
tduffy> */
tduffy> -void dapl_llist_init_head(DAPL_LLIST_HEAD * head)
tduffy> +void dapl_llist_init_head(struct dapl_llist_entry **head)
tduffy> {
tduffy> *head = NULL;
tduffy> }
tduffy> @@ -67,7 +67,7 @@ void dapl_llist_init_head(DAPL_LLIST_HEA
tduffy> *
tduffy> * Purpose: initialize a linked list entry
tduffy> */
tduffy> -void dapl_llist_init_entry(DAPL_LLIST_ENTRY * entry)
tduffy> +void dapl_llist_init_entry(struct dapl_llist_entry *entry)
tduffy> {
tduffy> entry->blink = NULL;
tduffy> entry->flink = NULL;
tduffy> @@ -80,7 +80,7 @@ void dapl_llist_init_entry(DAPL_LLIST_EN
tduffy> *
tduffy> * Purpose: returns TRUE if the linked list is empty
tduffy> */
tduffy> -boolean_t dapl_llist_is_empty(DAPL_LLIST_HEAD * head)
tduffy> +boolean_t dapl_llist_is_empty(struct dapl_llist_entry **head)
tduffy> {
tduffy> return (*head == NULL);
tduffy> }
tduffy> @@ -91,10 +91,10 @@ boolean_t dapl_llist_is_empty(DAPL_LLIST
tduffy> * Purpose: Add an entry to the head of a linked list
tduffy> */
tduffy> void
tduffy> -dapl_llist_add_head(DAPL_LLIST_HEAD * head,
tduffy> - DAPL_LLIST_ENTRY * entry, void *data)
tduffy> +dapl_llist_add_head(struct dapl_llist_entry **head,
tduffy> + struct dapl_llist_entry *entry, void *data)
tduffy> {
tduffy> - DAPL_LLIST_ENTRY *first;
tduffy> + struct dapl_llist_entry *first;
tduffy>
tduffy> /* deal with empty list */
tduffy> if (dapl_llist_is_empty(head)) {
tduffy> @@ -119,10 +119,10 @@ dapl_llist_add_head(DAPL_LLIST_HEAD * he
tduffy> * Purpose: Add an entry to the tail of a linked list
tduffy> */
tduffy> void
tduffy> -dapl_llist_add_tail(DAPL_LLIST_HEAD * head,
tduffy> - DAPL_LLIST_ENTRY * entry, void *data)
tduffy> +dapl_llist_add_tail(struct dapl_llist_entry **head,
tduffy> + struct dapl_llist_entry *entry, void *data)
tduffy> {
tduffy> - DAPL_LLIST_ENTRY *last;
tduffy> + struct dapl_llist_entry *last;
tduffy>
tduffy> /* deal with empty list */
tduffy> if (dapl_llist_is_empty(head)) {
tduffy> @@ -147,12 +147,12 @@ dapl_llist_add_tail(DAPL_LLIST_HEAD * he
tduffy> * not verify the list or the validity of the entries passed in.
tduffy> */
tduffy> void
tduffy> -dapl_llist_add_entry(DAPL_LLIST_HEAD * head,
tduffy> - DAPL_LLIST_ENTRY * entry,
tduffy> - DAPL_LLIST_ENTRY * new_entry, void *data)
tduffy> +dapl_llist_add_entry(struct dapl_llist_entry **head,
tduffy> + struct dapl_llist_entry *entry,
tduffy> + struct dapl_llist_entry *new_entry, void *data)
tduffy> {
tduffy> - DAPL_LLIST_ENTRY *first;
tduffy> - DAPL_LLIST_ENTRY *prev;
tduffy> + struct dapl_llist_entry *first;
tduffy> + struct dapl_llist_entry *prev;
tduffy>
tduffy> /* get the head pointer */
tduffy> first = *head;
tduffy> @@ -180,9 +180,9 @@ dapl_llist_add_entry(DAPL_LLIST_HEAD * h
tduffy> *
tduffy> * Purpose: Remove the first entry of a linked list
tduffy> */
tduffy> -void *dapl_llist_remove_head(DAPL_LLIST_HEAD * head)
tduffy> +void *dapl_llist_remove_head(struct dapl_llist_entry **head)
tduffy> {
tduffy> - DAPL_LLIST_ENTRY *first;
tduffy> + struct dapl_llist_entry *first;
tduffy>
tduffy> dapl_os_assert(!dapl_llist_is_empty(head));
tduffy> first = *head;
tduffy> @@ -206,9 +206,9 @@ void *dapl_llist_remove_head(DAPL_LLIST_
tduffy> *
tduffy> * Purpose: Remove the last entry of a linked list
tduffy> */
tduffy> -void *dapl_llist_remove_tail(DAPL_LLIST_HEAD * head)
tduffy> +void *dapl_llist_remove_tail(struct dapl_llist_entry **head)
tduffy> {
tduffy> - DAPL_LLIST_ENTRY *last;
tduffy> + struct dapl_llist_entry *last;
tduffy>
tduffy> dapl_os_assert(!dapl_llist_is_empty(head));
tduffy> last = (*head)->blink;
tduffy> @@ -232,9 +232,10 @@ void *dapl_llist_remove_tail(DAPL_LLIST_
tduffy> *
tduffy> * Purpose: Remove the specified entry from a linked list
tduffy> */
tduffy> -void *dapl_llist_remove_entry(DAPL_LLIST_HEAD * head, DAPL_LLIST_ENTRY * entry)
tduffy> +void *dapl_llist_remove_entry(struct dapl_llist_entry **head,
tduffy> + struct dapl_llist_entry *entry)
tduffy> {
tduffy> - DAPL_LLIST_ENTRY *first;
tduffy> + struct dapl_llist_entry *first;
tduffy>
tduffy> dapl_os_assert(!dapl_llist_is_empty(head));
tduffy> first = *head;
tduffy> @@ -263,9 +264,9 @@ void *dapl_llist_remove_entry(DAPL_LLIST
tduffy> * dapl_llist_peek_head
tduffy> */
tduffy>
tduffy> -void *dapl_llist_peek_head(DAPL_LLIST_HEAD * head)
tduffy> +void *dapl_llist_peek_head(struct dapl_llist_entry **head)
tduffy> {
tduffy> - DAPL_LLIST_ENTRY *first;
tduffy> + struct dapl_llist_entry *first;
tduffy>
tduffy> dapl_os_assert(!dapl_llist_is_empty(head));
tduffy> first = *head;
tduffy> @@ -279,9 +280,10 @@ void *dapl_llist_peek_head(DAPL_LLIST_HE
tduffy> * head
tduffy> */
tduffy>
tduffy> -void *dapl_llist_next_entry(DAPL_LLIST_HEAD * head, DAPL_LLIST_ENTRY * cur_ent)
tduffy> +void *dapl_llist_next_entry(struct dapl_llist_entry **head,
tduffy> + struct dapl_llist_entry *cur_ent)
tduffy> {
tduffy> - DAPL_LLIST_ENTRY *next;
tduffy> + struct dapl_llist_entry *next;
tduffy>
tduffy> dapl_os_assert(!dapl_llist_is_empty(head));
tduffy> if (cur_ent == NULL) {
tduffy> @@ -301,10 +303,10 @@ void *dapl_llist_next_entry(DAPL_LLIST_H
tduffy> *
tduffy> * Purpose: Prints the linked list for debugging
tduffy> */
tduffy> -void dapl_llist_debug_print_list(DAPL_LLIST_HEAD * head)
tduffy> +void dapl_llist_debug_print_list(struct dapl_llist_entry **head)
tduffy> {
tduffy> - DAPL_LLIST_ENTRY *entry;
tduffy> - DAPL_LLIST_ENTRY *first;
tduffy> + struct dapl_llist_entry *entry;
tduffy> + struct dapl_llist_entry *first;
tduffy> first = *head;
tduffy> if (!first) {
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_UTIL, "EMPTY_LIST\n");
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_hash.h
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_hash.h (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_hash.h (working copy)
tduffy> @@ -67,19 +67,19 @@
tduffy> * *
tduffy> *********************************************************************/
tduffy>
tduffy> -extern u32 dapl_hash_create(int capacity, DAPL_HASH_TABLE **pp_table);
tduffy> +extern u32 dapl_hash_create(int capacity, struct dapl_hash_table **pp_table);
tduffy>
tduffy> -extern u32 dapl_hash_free(DAPL_HASH_TABLE *p_table);
tduffy> +extern u32 dapl_hash_free(struct dapl_hash_table *p_table);
tduffy>
tduffy> -extern u32 dapl_hash_size(DAPL_HASH_TABLE *p_table, int *p_size);
tduffy> +extern u32 dapl_hash_size(struct dapl_hash_table *p_table, int *p_size);
tduffy>
tduffy> -extern u32 dapl_hash_insert(DAPL_HASH_TABLE *p_table, DAPL_HASH_KEY key,
tduffy> +extern u32 dapl_hash_insert(struct dapl_hash_table *p_table, DAPL_HASH_KEY key,
tduffy> DAPL_HASH_DATA data);
tduffy>
tduffy> -extern u32 dapl_hash_search(DAPL_HASH_TABLE *p_table, DAPL_HASH_KEY key,
tduffy> +extern u32 dapl_hash_search(struct dapl_hash_table *p_table, DAPL_HASH_KEY key,
tduffy> DAPL_HASH_DATA *p_data);
tduffy>
tduffy> -extern u32 dapl_hash_remove(DAPL_HASH_TABLE *p_table, DAPL_HASH_KEY key,
tduffy> +extern u32 dapl_hash_remove(struct dapl_hash_table *p_table, DAPL_HASH_KEY key,
tduffy> DAPL_HASH_DATA *p_data);
tduffy>
tduffy> #endif /* DAPL_HASH_H */
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_lmr_kcreate.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_lmr_kcreate.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_lmr_kcreate.c (working copy)
tduffy> @@ -37,8 +37,8 @@
tduffy> #include "dapl_lmr_util.h"
tduffy> #include "dapl_openib_util.h"
tduffy>
tduffy> -static inline u32 dapl_lmr_create_virtual(DAPL_IA *ia, void *virt_addr,
tduffy> - u64 length, DAPL_PZ *pz,
tduffy> +static inline u32 dapl_lmr_create_virtual(struct dapl_ia *ia, void *virt_addr,
tduffy> + u64 length, struct dapl_pz *pz,
tduffy> enum dat_mem_priv_flags privileges,
tduffy> DAT_LMR_HANDLE *lmr_handle,
tduffy> DAT_LMR_CONTEXT *lmr_context,
tduffy> @@ -46,7 +46,7 @@ static inline u32 dapl_lmr_create_virtua
tduffy> u64 *registered_length,
tduffy> u64 *registered_address)
tduffy> {
tduffy> - DAPL_LMR *lmr;
tduffy> + struct dapl_lmr *lmr;
tduffy> DAT_REGION_DESCRIPTION reg_desc;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> @@ -114,9 +114,9 @@ bail:
tduffy>
tduffy> }
tduffy>
tduffy> -static inline u32 dapl_lmr_create_physical(DAPL_IA *ia,
tduffy> +static inline u32 dapl_lmr_create_physical(struct dapl_ia *ia,
tduffy> DAT_REGION_DESCRIPTION phys_addr,
tduffy> - u64 page_count, DAPL_PZ *pz,
tduffy> + u64 page_count, struct dapl_pz *pz,
tduffy> enum dat_mem_priv_flags privileges,
tduffy> DAT_LMR_HANDLE *lmr_handle,
tduffy> DAT_LMR_CONTEXT *lmr_context,
tduffy> @@ -124,7 +124,7 @@ static inline u32 dapl_lmr_create_physic
tduffy> u64 *registered_length,
tduffy> u64 *registered_address)
tduffy> {
tduffy> - DAPL_LMR *lmr;
tduffy> + struct dapl_lmr *lmr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy> u64 *array = phys_addr.for_array;
tduffy>
tduffy> @@ -190,8 +190,9 @@ bail:
tduffy> return dat_status;
tduffy> }
tduffy>
tduffy> -static inline u32 dapl_lmr_create_lmr(DAPL_IA *ia, DAPL_LMR *original_lmr,
tduffy> - DAPL_PZ *pz,
tduffy> +static inline u32 dapl_lmr_create_lmr(struct dapl_ia *ia,
tduffy> + struct dapl_lmr *original_lmr,
tduffy> + struct dapl_pz *pz,
tduffy> enum dat_mem_priv_flags privileges,
tduffy> DAT_LMR_HANDLE *lmr_handle,
tduffy> DAT_LMR_CONTEXT *lmr_context,
tduffy> @@ -199,7 +200,7 @@ static inline u32 dapl_lmr_create_lmr(DA
tduffy> u64 *registered_length,
tduffy> u64 *registered_address)
tduffy> {
tduffy> - DAPL_LMR *lmr;
tduffy> + struct dapl_lmr *lmr;
tduffy> DAT_REGION_DESCRIPTION reg_desc;
tduffy> u32 dat_status;
tduffy>
tduffy> @@ -309,8 +310,8 @@ u32 dapl_lmr_kcreate(DAT_IA_HANDLE ia_ha
tduffy> enum dat_mem_optimize_flags optimization, DAT_LMR_HANDLE *lmr_handle,
tduffy> DAT_LMR_CONTEXT *lmr_context, DAT_RMR_CONTEXT *rmr_context, u64 *registered_length, u64 *registered_address)
tduffy> {
tduffy> - DAPL_IA *ia;
tduffy> - DAPL_PZ *pz;
tduffy> + struct dapl_ia *ia;
tduffy> + struct dapl_pz *pz;
tduffy> u32 dat_status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> @@ -328,8 +329,8 @@ u32 dapl_lmr_kcreate(DAT_IA_HANDLE ia_ha
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - ia = (DAPL_IA *) ia_handle;
tduffy> - pz = (DAPL_PZ *) pz_handle;
tduffy> + ia = (struct dapl_ia *)ia_handle;
tduffy> + pz = (struct dapl_pz *)pz_handle;
tduffy>
tduffy> switch (mem_type) {
tduffy> case DAT_MEM_TYPE_VIRTUAL:
tduffy> @@ -358,7 +359,7 @@ u32 dapl_lmr_kcreate(DAT_IA_HANDLE ia_ha
tduffy> }
tduffy> case DAT_MEM_TYPE_LMR:
tduffy> {
tduffy> - DAPL_LMR *lmr;
tduffy> + struct dapl_lmr *lmr;
tduffy>
tduffy> if (DAPL_BAD_HANDLE
tduffy> (region_description.for_lmr_handle,
tduffy> @@ -369,7 +370,7 @@ u32 dapl_lmr_kcreate(DAT_IA_HANDLE ia_ha
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - lmr = (DAPL_LMR *) region_description.for_lmr_handle;
tduffy> + lmr = (struct dapl_lmr *)region_description.for_lmr_handle;
tduffy>
tduffy> dat_status =
tduffy> dapl_lmr_create_lmr(ia, lmr, pz, privileges,
tduffy> @@ -394,6 +395,6 @@ u32 dapl_lmr_kcreate(DAT_IA_HANDLE ia_ha
tduffy> }
tduffy> }
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return dat_status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_post_recv.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_post_recv.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_post_recv.c (working copy)
tduffy> @@ -71,8 +71,8 @@ u32 dapl_ep_post_recv(DAT_EP_HANDLE ep_h
tduffy> DAT_DTO_COOKIE user_cookie,
tduffy> enum dat_completion_flags completion_flags)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> - DAPL_COOKIE *cookie;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> + struct dapl_cookie *cookie;
tduffy> u32 dat_status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> @@ -87,7 +87,7 @@ u32 dapl_ep_post_recv(DAT_EP_HANDLE ep_h
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy>
tduffy> /*
tduffy> * Synchronization ok since this buffer is only used for receive
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_cr_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_cr_query.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_cr_query.c (working copy)
tduffy> @@ -36,7 +36,7 @@
tduffy>
tduffy> u32 dapl_cr_query(DAT_CR_HANDLE cr_handle, struct dat_cr_param *cr_param)
tduffy> {
tduffy> - DAPL_CR *cr_ptr;
tduffy> + struct dapl_cr *cr_ptr;
tduffy> u32 status;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API,
tduffy> @@ -53,7 +53,7 @@ u32 dapl_cr_query(DAT_CR_HANDLE cr_handl
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - cr_ptr = (DAPL_CR *) cr_handle;
tduffy> + cr_ptr = (struct dapl_cr *)cr_handle;
tduffy>
tduffy> /* obtain the remote IP address */
tduffy> (void) dapl_ib_cm_remote_addr((DAT_HANDLE) cr_handle,
tduffy> @@ -64,6 +64,6 @@ u32 dapl_cr_query(DAT_CR_HANDLE cr_handl
tduffy>
tduffy> status = DAT_SUCCESS;
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_rsp_query.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_rsp_query.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_rsp_query.c (working copy)
tduffy> @@ -40,7 +40,7 @@
tduffy>
tduffy> u32 dapl_rsp_query(DAT_RSP_HANDLE rsp_handle, struct dat_rsp_param *rsp_param)
tduffy> {
tduffy> - DAPL_SP *sp_ptr;
tduffy> + struct dapl_sp *sp_ptr;
tduffy> u32 status;
tduffy>
tduffy> if (DAPL_BAD_HANDLE(rsp_handle, DAPL_MAGIC_RSP)) {
tduffy> @@ -53,7 +53,7 @@ u32 dapl_rsp_query(DAT_RSP_HANDLE rsp_ha
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - sp_ptr = (DAPL_SP *) rsp_handle;
tduffy> + sp_ptr = (struct dapl_sp *)rsp_handle;
tduffy>
tduffy> /*
tduffy> * Fill in the RSP params
tduffy> @@ -65,6 +65,6 @@ u32 dapl_rsp_query(DAT_RSP_HANDLE rsp_ha
tduffy>
tduffy> status = DAT_SUCCESS;
tduffy>
tduffy> - bail:
tduffy> +bail:
tduffy> return status;
tduffy> }
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_pz_free.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_pz_free.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_pz_free.c (working copy)
tduffy> @@ -56,7 +56,7 @@
tduffy> */
tduffy> u32 dapl_pz_free(DAT_PZ_HANDLE pz_handle)
tduffy> {
tduffy> - DAPL_PZ *pz;
tduffy> + struct dapl_pz *pz;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_pz_free (%p)\n", pz_handle);
tduffy> @@ -67,7 +67,7 @@ u32 dapl_pz_free(DAT_PZ_HANDLE pz_handle
tduffy> goto bail;
tduffy> }
tduffy>
tduffy> - pz = (DAPL_PZ *) pz_handle;
tduffy> + pz = (struct dapl_pz *)pz_handle;
tduffy>
tduffy> if (0 != atomic_read(&pz->pz_ref_count)) {
tduffy> dat_status =
tduffy> Index: linux-kernel-resolv/dat-provider/dapl_ep_set_watermark.c
tduffy> ===================================================================
tduffy> --- linux-kernel-resolv/dat-provider/dapl_ep_set_watermark.c (revision 2431)
tduffy> +++ linux-kernel-resolv/dat-provider/dapl_ep_set_watermark.c (working copy)
tduffy> @@ -63,13 +63,13 @@ u32 dapl_ep_set_watermark(DAT_EP_HANDLE
tduffy> int soft_high_watermark,
tduffy> int hard_high_watermark)
tduffy> {
tduffy> - DAPL_EP *ep_ptr;
tduffy> + struct dapl_ep *ep_ptr;
tduffy> u32 dat_status = DAT_SUCCESS;
tduffy>
tduffy> dapl_dbg_log(DAPL_DBG_TYPE_API, "dapl_ep_set_watermark (%p, %d, %d)\n",
tduffy> ep_handle, soft_high_watermark, hard_high_watermark);
tduffy>
tduffy> - ep_ptr = (DAPL_EP *) ep_handle;
tduffy> + ep_ptr = (struct dapl_ep *)ep_handle;
tduffy>
tduffy> /*
tduffy> * Verify parameter & state
tduffy>
More information about the general
mailing list