From nobody Sat Dec 4 06:40:42 2021 X-Original-To: dev-commits-src-main@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 3B48918B652A; Sat, 4 Dec 2021 06:40:43 +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 4J5g7G5xPlz4Zqf; Sat, 4 Dec 2021 06:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AC1FB1FA3D; Sat, 4 Dec 2021 06:40:42 +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 1B46eg9R047027; Sat, 4 Dec 2021 06:40:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B46egVt047026; Sat, 4 Dec 2021 06:40:42 GMT (envelope-from git) Date: Sat, 4 Dec 2021 06:40:42 GMT Message-Id: <202112040640.1B46egVt047026@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Scott Long Subject: git: 2d5d242406e5 - main - Fix "set but not used" for geom List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: scottl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d5d242406e5ce02b9975b366655ba31e2477eef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638600042; 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=Jl+dqnnX2H4z9GxOQ9DvgTLTkMKVuYdenrKcaC/EdkA=; b=JatexBRo3JfXuHaI+obkGFTIt5ri5M7JvT1NSa+QHJHfyXNmUV9yJJcanv0N/5T29WY3qB bfs9nNAju3QipgZ1kPbXV+zqxj0YI8l7ggFSh7W4AWDJvxN76T1qcXiyt4uKea1V2saQVG NvuRbOmLpQI7cFsFOPVxz7YLNHIDwB7E5bVsf5Y/ErNJ6R+40rs3mQqTVVLgYsU5yWsLZc RbyByTCeBLhOG3wkygONEb1lygh+sKgnvJhQi1O5SX6kq27beTu7pHKemFHmmOmoCOeLyg yaZB2jfD8D5pcJxGsd7qNco3zGw2pvInhytJnx2fOgdJbEyDFOmihJQTKE/yHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638600042; a=rsa-sha256; cv=none; b=N658hPwzhDF6UL+viMuuLrLjh49xIGcSYkaChQQFMFl9xgnXO/0XFH4ZGTL5GQgFjpvF/D J5FzKREAroY09rDpV/8XwvpgUz/hDpegG3RwFnPMnTfyOaNjlq1Vp+W8uQKkPSheECyFzB uBszNDVkh5/R0tpptuU80LCQEmOVOM6KvDZD+E+RvUpYLu2jRTFlfElSe5+gssFKoDOqd0 AO2MPO174iylT8yjkr6k23d7Wv+FjtVLLPP1npsX8t985uxq+vikHsRwlXR39ak9OEvuAV Lxtgh6AXeZdcpAvOL8CX+jeUTs1X7DazoCQTjx1vxiouTkmIxtSFkBzUVWhqgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by scottl: URL: https://cgit.FreeBSD.org/src/commit/?id=2d5d242406e5ce02b9975b366655ba31e2477eef commit 2d5d242406e5ce02b9975b366655ba31e2477eef Author: Scott Long AuthorDate: 2021-12-04 06:40:24 +0000 Commit: Scott Long CommitDate: 2021-12-04 06:40:24 +0000 Fix "set but not used" for geom Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/geom/geom_disk.c | 2 +- sys/geom/raid/g_raid.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c index 9877243fa36e..c062b0e777ac 100644 --- a/sys/geom/geom_disk.c +++ b/sys/geom/geom_disk.c @@ -362,7 +362,7 @@ g_disk_seg_limit(bus_dma_segment_t *seg, off_t *poffset, static off_t g_disk_vlist_limit(struct disk *dp, struct bio *bp, bus_dma_segment_t **pendseg) { - bus_dma_segment_t *seg, *end; + bus_dma_segment_t *seg, *end __diagused; off_t residual; off_t offset; int pages; diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c index 31adb0f2b513..807cca5b7e50 100644 --- a/sys/geom/raid/g_raid.c +++ b/sys/geom/raid/g_raid.c @@ -726,7 +726,7 @@ u_int g_raid_nsubdisks(struct g_raid_volume *vol, int state) { struct g_raid_subdisk *subdisk; - struct g_raid_softc *sc; + struct g_raid_softc *sc __diagused; u_int i, n ; sc = vol->v_softc; @@ -751,7 +751,7 @@ struct g_raid_subdisk * g_raid_get_subdisk(struct g_raid_volume *vol, int state) { struct g_raid_subdisk *sd; - struct g_raid_softc *sc; + struct g_raid_softc *sc __diagused; u_int i; sc = vol->v_softc; @@ -1181,7 +1181,7 @@ g_raid_is_in_locked_range(struct g_raid_volume *vol, const struct bio *bp) static void g_raid_start_request(struct bio *bp) { - struct g_raid_softc *sc; + struct g_raid_softc *sc __diagused; struct g_raid_volume *vol; sc = bp->bio_to->geom->softc; @@ -1258,7 +1258,7 @@ g_raid_finish_with_locked_ranges(struct g_raid_volume *vol, struct bio *bp) void g_raid_iodone(struct bio *bp, int error) { - struct g_raid_softc *sc; + struct g_raid_softc *sc __diagused; struct g_raid_volume *vol; sc = bp->bio_to->geom->softc;