From nobody Wed Jul 27 19:18:03 2022 X-Original-To: dev-commits-src-branches@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 4LtNpg4GN9z4XS09; Wed, 27 Jul 2022 19:18:03 +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 4LtNpg26HCz3G2v; Wed, 27 Jul 2022 19:18:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658949483; 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=jztka3po7RnTzaKSuMmDrCr2bGcKTs0vDblgrelw5Q0=; b=OQ6Gk0VqEH73wpw/QgvZ0HvLoHiJ6in/gGDOpsHHuXfPgv1QyPDeLG74sLiy+4LImqq1sD T+vgjeRw+32/LAMipEF96I1XToXQT0Ak+eRFJ5SgacL6Oz93IFpWFpZp2+uM3hWKFBEwY4 TS5AEG2h/YPxqzt2bOzlndD69EfNxg6lBO46LgmC5oFUlTjWH7yMI5N3Qm284coP55dmun H3bZkIcbu2Ps+zip69Fnfu4mUS6h969Xo0B+GMw1kNNVwqrovL+oYdsnoCP8sYdkZfcVJV 198g04k1dtBwpuPDgBvdmM6iYgrfKtRKozUS2+ZINPehR+YkYoL6ZMUExbNh2w== 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 4LtNpg16FvzSbS; Wed, 27 Jul 2022 19:18:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26RJI3rK058682; Wed, 27 Jul 2022 19:18:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26RJI3VO058681; Wed, 27 Jul 2022 19:18:03 GMT (envelope-from git) Date: Wed, 27 Jul 2022 19:18:03 GMT Message-Id: <202207271918.26RJI3VO058681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 6e9a64d7ef1e - stable/13 - Fix unused variable warning in icl_soft.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6e9a64d7ef1e5ccd0f07bb2471c8bafd261bcd80 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658949483; 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=jztka3po7RnTzaKSuMmDrCr2bGcKTs0vDblgrelw5Q0=; b=NzcDCf7GXJIjIms6fwFPlI4KprXYey9lP/PW2OlyyZl7nPdUVcSEiVyakfexg+CwiAvVBE bd6ljVWE2rnHl3ZM5ziYUOrovMiOPgS/pZviFaS/vuds7z6Z4MkIju946qZZO3JyQCfY5Q i3gYcJYo2/LhRTX9Y1byZIm0wGnWVPq9Q5uOHncmmYYMIGekW/O9puu0UDdNKN2VJvunjm W8Oy0dQv942HFLbzRMXXFrNe+fT9GABx0oHhpCG4/7SJ6iYSXOlsN+vzg91pE7xjuXNrV3 WviWPqmCKfYKzMANNcyxTSlDKaPGAnufPzAAdWApBIe2466y91a6bLD1SkfzHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658949483; a=rsa-sha256; cv=none; b=YHe5Kc4SzsAzjqqrRcUNBoSjmgg+eY14VGGv7sMzB0lHsWQeYZKwGPCQJddmv75udNqMSY lCQP6qWkD0MxPkQkgaOz3XedndSCJHJl3eHQVvIXkzatjuF0WzI7eTBMcdJ47zoss12kNp g8IZA0TF6Ro5SaCqC4cEnHEQ5AVmFx9N0cmpftUeKqOyq8tx12q2Gbghx7vPTDr1XqMu5f fDpHc0DQ1fj3vTjhCKx+G2bAwbIjNncwTPLZDV4QlkldAg+rC3hcd8MSiVITydGxLCMhgc Me3GJyOd5PX+IWxzu7rCQ8fRHsnXFTpBsF8DIVf4GgCKGBGyZ14NH8cUpCHz3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6e9a64d7ef1e5ccd0f07bb2471c8bafd261bcd80 commit 6e9a64d7ef1e5ccd0f07bb2471c8bafd261bcd80 Author: Dimitry Andric AuthorDate: 2022-07-24 20:54:08 +0000 Commit: Dimitry Andric CommitDate: 2022-07-27 19:16:22 +0000 Fix unused variable warning in icl_soft.c With clang 15, the following -Werror warning is produced: sys/dev/iscsi//icl_soft.c:886:6: error: variable 'coalesced' set but not used [-Werror,-Wunused-but-set-variable] int coalesced, error; ^ The 'coalesced' variable is eventually used only in an #if 0'd block, obviously meant for debugging. Ensure that 'coalesced' is only declared and used when DEBUG_COALESCED is defined, so the debugging can be easily turned on later, if desired. MFC after: 3 days (cherry picked from commit f4f847018048ac7699b55bc1915a393eb65e4c53) --- sys/dev/iscsi/icl_soft.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sys/dev/iscsi/icl_soft.c b/sys/dev/iscsi/icl_soft.c index 016f70ae9c52..96a4e9d0fa71 100644 --- a/sys/dev/iscsi/icl_soft.c +++ b/sys/dev/iscsi/icl_soft.c @@ -883,7 +883,10 @@ icl_conn_send_pdus(struct icl_soft_conn *isc, struct icl_pdu_stailq *queue) struct mbuf *m; struct socket *so; long available, size, size2; - int coalesced, error; +#ifdef DEBUG_COALESCED + int coalesced; +#endif + int error; ICL_CONN_LOCK_ASSERT_NOT(ic); @@ -942,7 +945,15 @@ icl_conn_send_pdus(struct icl_soft_conn *isc, struct icl_pdu_stailq *queue) } if (coalesce) { m = request->ip_bhs_mbuf; - for (coalesced = 1; ; coalesced++) { + for ( +#ifdef DEBUG_COALESCED + coalesced = 1 +#endif + ; ; +#ifdef DEBUG_COALESCED + coalesced++ +#endif + ) { request2 = STAILQ_FIRST(queue); if (request2 == NULL) break; @@ -967,7 +978,7 @@ icl_conn_send_pdus(struct icl_soft_conn *isc, struct icl_pdu_stailq *queue) size += size2; icl_soft_pdu_done(request2, 0); } -#if 0 +#ifdef DEBUG_COALESCED if (coalesced > 1) { ICL_DEBUG("coalesced %d PDUs into %ld bytes", coalesced, size);