From nobody Tue Jul 26 20:09:58 2022 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 4Lsp131TmBz4X2x5; Tue, 26 Jul 2022 20:09:59 +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 4Lsp130wnkz3KGC; Tue, 26 Jul 2022 20:09:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658866199; 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=/aet95AoL89TIX8XYi4AlM9VZhtQz8eKpLWNwop94S4=; b=D4IySd6SBSDVmlvHpmAJe8HEn+jr3YAAK35IQr5/TolRfR0+6e/xDPR34yjXC0v43RTVaD UOaI1J9M3yTGahvvljDIoPELI1iaJxk3v1aEqD2K8SOngveLozTs7zelroVIje1nn9kYTL ncNFkO0zI7GULWjdYaSfW6Id+xkM+H5pC2b4SpLApY7trqqNBFML5qPoQm99KG6Rsb7ij8 J0NS5f45bLOWai7kayOIQusZAba6Zo9qHwKKdrGHaknZ5gqOwhFYtCqGtVSoLuOM9Kac76 sWTratDxUpJ40XU3+KCTY5j6W6RiUn9UJXTsX19RLCiqaD3uSNpX9lyp1YGCoQ== 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 4Lsp1270KKzqJW; Tue, 26 Jul 2022 20:09:58 +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 26QK9wqn076257; Tue, 26 Jul 2022 20:09:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QK9wbL076256; Tue, 26 Jul 2022 20:09:58 GMT (envelope-from git) Date: Tue, 26 Jul 2022 20:09:58 GMT Message-Id: <202207262009.26QK9wbL076256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: c9dde6f0c713 - main - Fix unused variable warning in ffs_snapshot.c 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9dde6f0c713a027266c52cf94a33a086348c566 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658866199; 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=/aet95AoL89TIX8XYi4AlM9VZhtQz8eKpLWNwop94S4=; b=KWXFHm8SJ2IX/xFMZrvW5JBGRczncNej544bkJcLFIMa8ukidud981NUqw5X9FYqtnFlDo DXIbj+VkWOReQhntiEFgYQmXDX6aJ+lCEHY2wuh308X1OVrMlLcLVH1tOsbKR/pAPzxDsB Q4lTdmIk4sb+ScL4H4miSgGV59QLFAxym9jeK0kLWxwN+JZjylTM4uXMwz+YMz61yXgvGT yx0Mq/id/4tcTfwws5o8LG3uoFIAHrPDDDaY+9xq9pSBk34MRQSqol6PnFvvjCDLaWfyiv xC8xewKDBJA83r3fUypnorNDghCdiGpaHzq1fiEDlp056uze2bKgHzjz/ZhqjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658866199; a=rsa-sha256; cv=none; b=q1/RAcwVF46YRhzldOAaeE46725X9cG8OFJvZGk4oqDo7ZF8Ekbm3WNvFJdcTxafTyk3F3 xRX0A6aP6WHZI/GmOSrbXbGLUfa7ml3X/akKALRZtdDQeJkpXgNs01XcktouPVn0o8hm9U 1rSsMGAWbEXrrLdHrvtyY658NOLcMhxNJPjaiSpy6nU5t7mB+D5uCYZ29J1xvkqweWZXUI 7dJukNxoZJ04iPiF/1yijA8rsIVsfRjO9FXPtvHQlJZMYRzQ1jeeuYSVcgzym/tlILJ6/U GHykPGY5SJbZwJn8yGjaSrUXL57//OywtiaEzuO8r9lW5ssDiIS3BtwDDY5eow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c9dde6f0c713a027266c52cf94a33a086348c566 commit c9dde6f0c713a027266c52cf94a33a086348c566 Author: Dimitry Andric AuthorDate: 2022-07-26 19:30:41 +0000 Commit: Dimitry Andric CommitDate: 2022-07-26 19:32:51 +0000 Fix unused variable warning in ffs_snapshot.c With clang 15, the following -Werror warning is produced: sys/ufs/ffs/ffs_snapshot.c:204:7: error: variable 'redo' set but not used [-Werror,-Wunused-but-set-variable] long redo = 0, snaplistsize = 0; ^ The 'redo' variable is only used when DIAGNOSTIC is defined. Ensure it is only declared and set in that case. MFC after: 3 days --- sys/ufs/ffs/ffs_snapshot.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index a23c4ab02bf6..84983a111fe4 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -201,7 +201,10 @@ ffs_snapshot(struct mount *mp, char *snapfile) ufs2_daddr_t blockno; uint64_t flag; char saved_nice = 0; - long redo = 0, snaplistsize = 0; +#ifdef DIAGNOSTIC + long redo = 0; +#endif + long snaplistsize = 0; int32_t *lp; void *space; struct fs *copy_fs = NULL, *fs; @@ -457,7 +460,9 @@ restart: for (cg = 0; cg < fs->fs_ncg; cg++) { if ((ACTIVECGNUM(fs, cg) & ACTIVECGOFF(cg)) != 0) continue; +#ifdef DIAGNOSTIC redo++; +#endif error = UFS_BALLOC(vp, lfragtosize(fs, cgtod(fs, cg)), fs->fs_bsize, KERNCRED, 0, &nbp); if (error)