On Thu, May 07, 2015 at 01:54:52PM +0300, Hal Rosenstock wrote:
>
> Treat umad_open_port and umad_register errors as failures for sa_get_handle
>
> Signed-off-by: Hal Rosenstock <[email protected]>
Thanks applied,
Ira
> ---
> diff --git a/src/ibdiag_sa.c b/src/ibdiag_sa.c
> index 018a428..a089aee 100644
> --- a/src/ibdiag_sa.c
> +++ b/src/ibdiag_sa.c
> @@ -60,18 +60,32 @@ struct sa_handle * sa_get_handle(void)
> IBWARN("No SM/SA found on port %s:%d",
> ibd_ca ? "" : ibd_ca,
> ibd_ca_port);
> - free(handle);
> - return (NULL);
> + goto err;
> }
>
> handle->dport.qp = 1;
> if (!handle->dport.qkey)
> handle->dport.qkey = IB_DEFAULT_QP1_QKEY;
>
> - handle->fd = umad_open_port(ibd_ca, ibd_ca_port);
> - handle->agent = umad_register(handle->fd, IB_SA_CLASS, 2, 1, NULL);
> + if ((handle->fd = umad_open_port(ibd_ca, ibd_ca_port)) < 0) {
> + IBWARN("umad_open_port on port %s:%d failed",
> + ibd_ca ? "" : ibd_ca,
> + ibd_ca_port);
> + goto err;
> + }
> + if ((handle->agent = umad_register(handle->fd, IB_SA_CLASS, 2, 1,
> NULL)) < 0) {
> + umad_close_port(handle->fd);
> + IBWARN("umad_register for SA class failed on port %s:%d",
> + ibd_ca ? "" : ibd_ca,
> + ibd_ca_port);
> + goto err;
> + }
>
> return handle;
> +
> +err:
> + free(handle);
> + return (NULL);
> }
>
> void sa_free_handle(struct sa_handle * h)
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
