Date: Tue, 6 Feb 2024 02:58:50 GMT From: Eric Joyner <erj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 8e1f58caf79b - main - ofed: fix warnings during libibverbs compilation Message-ID: <202402060258.4162woqo005685@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=8e1f58caf79bd50e6d0b1ae29d4fee8344f6f84c commit 8e1f58caf79bd50e6d0b1ae29d4fee8344f6f84c Author: Bartosz Sobczak <bartosz.sobczak@intel.com> AuthorDate: 2024-02-06 02:43:48 +0000 Commit: Eric Joyner <erj@FreeBSD.org> CommitDate: 2024-02-06 02:58:20 +0000 ofed: fix warnings during libibverbs compilation create_qp_handle_resp_common_cleanup should be void __ibv_cleanup_wq should use wq->cond for cond destroy both issues were overlooked in: a687910 ('Cleanup pthread locks in ofed RDMA verbs') Signed-off-by: Bartosz Sobczak <bartosz.sobczak@intel.com> Signed-off-by: Eric Joyner <erj@FreeBSD.org> Reviewed by: sean.lim@dell.com, vangyzen@, erj@ MFC after: 1 day Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D43491 --- contrib/ofed/libibverbs/cmd.c | 2 +- contrib/ofed/libibverbs/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/ofed/libibverbs/cmd.c b/contrib/ofed/libibverbs/cmd.c index 488ffedd146b..df6af3933e36 100644 --- a/contrib/ofed/libibverbs/cmd.c +++ b/contrib/ofed/libibverbs/cmd.c @@ -904,7 +904,7 @@ static int create_qp_ex_common(struct verbs_qp *qp, return 0; } -static int create_qp_handle_resp_common_cleanup(struct verbs_qp *qp) +static void create_qp_handle_resp_common_cleanup(struct verbs_qp *qp) { pthread_cond_destroy(&qp->qp.cond); pthread_mutex_destroy(&qp->qp.mutex); diff --git a/contrib/ofed/libibverbs/device.c b/contrib/ofed/libibverbs/device.c index c3d0dbf573ab..6ea7fc241ed8 100644 --- a/contrib/ofed/libibverbs/device.c +++ b/contrib/ofed/libibverbs/device.c @@ -456,7 +456,7 @@ default_symver(__ibv_init_wq, ibv_init_wq); void __ibv_cleanup_wq(struct ibv_wq *wq) { - pthread_cond_destroy(&wq->mutex); + pthread_cond_destroy(&wq->cond); pthread_mutex_destroy(&wq->mutex); } default_symver(__ibv_cleanup_wq, ibv_cleanup_wq);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402060258.4162woqo005685>