From nobody Tue Feb 06 02:58:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TTScp4j3Cz58NW6; Tue, 6 Feb 2024 02:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TTScp3ql9z4T54; Tue, 6 Feb 2024 02:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707188330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RfGwUm8A0MgeddJmZWCyKc43jjbw0sELhZDeKVHppGk=; b=KxmjegzZOPilCG2xC/GdPj+QYwxKME1ud5/mbkKc3qN82fB2hZHgtCjwwYM/rJcFG98460 940s+m/guBymqfYcuVnY+HGk7NhbWj37SL/gdov7y8xUSBDgHx4C3bZMa2AKajPTrqU9tE 0uccybxgcWJC+hDP91XN3bHUccD6aIk0tkgHpxX9O32veJTxRJ8HFsK1Obk0FKCEXvH/QV F0K3R0aB4LtwPIsvIVxqw2Qss8Q+xlQ69jEGBWuPsU49fbOZh9Njd3dPkrAWMOzxMQYiO/ hErCySHEcwD37WHMqodCHYe7p8ZAw4NUkh2cLVvpWL28n8YLTjFKl7b2ci03Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707188330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RfGwUm8A0MgeddJmZWCyKc43jjbw0sELhZDeKVHppGk=; b=jWWjXFhCnIeOWyVABzrVj3EonpNbslYlywMDtDo8MvZfAOAR4guYPnyrgW9wd+0oJnACes 9MGe5kFjuM8ANXWZKPE2Akq8GgpYU1GoqBJ/SVVYkYIOM52GZPyu1EmkyExQ8Qs49DLWM1 amIfq/v6S93eeykui2Q7k1INTc6QLWJjjS5WcbwPLCxswcdeopn9mXBmaoqmIeCznhcH82 aQLCqgablv/vy1bwUlMuK0nAoIWT44OasmE+k/6ftPhmPDFq9FclpirB8Q1VghDzR13LHE wnCrtdt7LGA+FgNiNTWk7e5cRIE3eceb8ehiqePNL7ngE+hMev4tqxoTCkEFgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707188330; a=rsa-sha256; cv=none; b=OmhHylt0D+Aq0x9ONgj5llr6pGNvtk79nwcS/aPZp41MBns8xA06sm9rZuo51TtWX4MnLZ slAkwn16apy245q//VCvVEXhKQeT2A6sS7a/1MWAd6mlIHCsW8ozhNESx23TIjNLMkE+BR nHblj22Dj27mu1XGh0245F63romskyk7odO3M/fxAo58Eu79f/wBKq+AybQIGxuvIb1rB7 KwffacKBi2sXHEczaRyZv6yloysUbarepBFKUqXZ27BsiuXy7ggs79+CXMnfzyf9r5kUnY 62qYAJG58+2YebSvDExwEtkxpMerL7HMgTQRd2CoIB89Ck9zMJ0s6stLusNfUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TTScp2v0vz15r3; Tue, 6 Feb 2024 02:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4162woqW005688; Tue, 6 Feb 2024 02:58:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4162woqo005685; Tue, 6 Feb 2024 02:58:50 GMT (envelope-from git) Date: Tue, 6 Feb 2024 02:58:50 GMT Message-Id: <202402060258.4162woqo005685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: 8e1f58caf79b - main - ofed: fix warnings during libibverbs compilation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e1f58caf79bd50e6d0b1ae29d4fee8344f6f84c Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=8e1f58caf79bd50e6d0b1ae29d4fee8344f6f84c commit 8e1f58caf79bd50e6d0b1ae29d4fee8344f6f84c Author: Bartosz Sobczak AuthorDate: 2024-02-06 02:43:48 +0000 Commit: Eric Joyner 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 Signed-off-by: Eric Joyner 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);