From nobody Wed Sep 06 21:56:36 2023 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 4Rgx6D2tJXz4sJCZ; Wed, 6 Sep 2023 21:56:36 +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 4Rgx6D2Mg1z3Zq5; Wed, 6 Sep 2023 21:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037396; 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=z2nLpHpHOic7Yi8QujvjEMT3GkcRBzTWswhnr+0RjUk=; b=V6zNnAKbk3fn1uvKa7F5psJf0yqe4lgiOmVc/J4hbwQOaBRc82ptGeFQKrDiaiJoM2jBo9 kChHloLWoe/uK8kGFZe/sLDqigIerPR9sH+tr450pzCbYq8WFTmOrWLtXOefKR0EkpbbmF Ua0bw0hMxoZKaIGuyi1Uj8FrzBw7yl0tcL5Jjjd7+AU80RfTf60xfTfNkudNYowdobeS5w 5f8djD77iRIOrZ4Pjy20xJGomlYsO0yrUcdRfn1Dq8IcUKedG3EtN9tjfEJRTGTsE+0Bj9 RSq7d1HyscspkuXIsHEsnkgCam2ts8hwvUGX7KyC+qTxSU0MPNKl3UitSL1gnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037396; a=rsa-sha256; cv=none; b=rMg2lGgPBRfz7+PI3QY2xjp+rqhCZ0Tnl6ylmvQXz8K2Aoje3nZde24Xiy7TVyM06ogoBp GU0q64rZosBKiA7vGoqjO5a6ffxGBu0FyKXdYI9AxCfbgVC2eByzU6D6/yL7tpVxWjBFjr 2hn1Pmr61lJFlFO+AJWzktezN9dals3IS9T1kLTnqyG2HhWyga+wP82wE/fGHuVz6qYZbt vITCyaC6G1QC2/s+RTYHQ2hcBTuCpUDk6WFwKOdGsQvHWvxKu4Kb95b7zpIm8wK5K3jS7X gSJgtx4MKnVotX+KbfYr9NWndEfQAwKFCtx/ekcUobzrfx0KbgeuGtxpSfv8eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037396; 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=z2nLpHpHOic7Yi8QujvjEMT3GkcRBzTWswhnr+0RjUk=; b=sGb/GUP2ifp64O5OHHp82bozo70+lfAEErlrae9uoa2Zt8B/E5cL0ut7GQly7lnwvc9Rcx yCJI184AcVBYKEs+lW4DJ2tQ9ZPn9Sxe4tKrxrg/qvhme3CMYg5XIxdJqMwPlY+7CJL1uK S8Ry4PrBjwk/QzJmdRCh94D9aMqilMYXfGUkUtQ+GGNqgfMJw8S2TwuDWzVYG1HaY6jXS0 dqLJzr7BmnAiArMW29Tsz1+cysjLUJj0OUfinr4ei0yyir8mlUUNMmQPZ0cuL7WeRWHO8O u1uMwILoH7c0C2+3aPgDpg5sKfUypY1ApLH1sJ5o8c/qR2dJLTxUe32aqB2+dg== 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 4Rgx6D1NrrzYvW; Wed, 6 Sep 2023 21:56:36 +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 386LuaHj022574; Wed, 6 Sep 2023 21:56:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Lua9k022571; Wed, 6 Sep 2023 21:56:36 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:36 GMT Message-Id: <202309062156.386Lua9k022571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8165540af2cd - stable/13 - aio: whack "set but not used" warnings 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8165540af2cd270e0dd8ffdbb72a6e2e25dbe3d5 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8165540af2cd270e0dd8ffdbb72a6e2e25dbe3d5 commit 8165540af2cd270e0dd8ffdbb72a6e2e25dbe3d5 Author: Mateusz Guzik AuthorDate: 2021-11-14 16:59:53 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 aio: whack "set but not used" warnings (cherry picked from commit e9c7ec22877f461f530dfe1cb8e17086300c0ee8) --- sys/kern/vfs_aio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 5ad912ea38c4..5ffc0b31c2ae 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -758,7 +758,6 @@ aio_process_rw(struct kaiocb *job) { struct ucred *td_savedcred; struct thread *td; - struct aiocb *cb; struct file *fp; ssize_t cnt; long msgsnd_st, msgsnd_end; @@ -778,7 +777,6 @@ aio_process_rw(struct kaiocb *job) td_savedcred = td->td_ucred; td->td_ucred = job->cred; job->uiop->uio_td = td; - cb = &job->uaiocb; fp = job->fd_file; opcode = job->uaiocb.aio_lio_opcode; @@ -2472,7 +2470,7 @@ aio_biowakeup(struct bio *bp) size_t nbytes; long bcount = bp->bio_bcount; long resid = bp->bio_resid; - int error, opcode, nblks; + int opcode, nblks; int bio_error = bp->bio_error; uint16_t flags = bp->bio_flags; @@ -2483,7 +2481,6 @@ aio_biowakeup(struct bio *bp) nbytes =bcount - resid; atomic_add_acq_long(&job->nbytes, nbytes); nblks = btodb(nbytes); - error = 0; /* * If multiple bios experienced an error, the job will reflect the * error of whichever failed bio completed last.