From nobody Fri Jul 29 19:41:12 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 4LvdDS4TGlz4Y8bn; Fri, 29 Jul 2022 19:41:12 +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 4LvdDS42sdz485f; Fri, 29 Jul 2022 19:41:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659123672; 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=tX5UJUqpOm+w+KZzq6EmV+p5xOhtY3i+kEMfYWA05E4=; b=R12fhHRtiNdxjIKMd6gnJMaf8fvON2qgfAnME+/g0+nuqbyHjEnFeDuddbO/FCa12NzGeF gQmdS2i/B3zzylkIUHVF/qcWaIBB/o6nRQ5DbzcAv5hGSA62aSrAN916ajxG6h+P9L3AXz IIAFobWlPUMT6nR0Emc3oZnnhh+kx0RY/Dfus6jQWO5RgmRsIppcUZSVKhXU4Sk6AZnb8N ddN3SH5Y/7AnbFeyPevtQOp9dCoWrRhNdUdI08zL7FXhl9Iocol3NvfVq2dxBftfnZcCio i1SuHjs0WrSHrmV5YOkSVA7jqOkOiAGTwcCaSz/EdrVM62KvTbvAyOFIVeCmAw== 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 4LvdDS36zJznSj; Fri, 29 Jul 2022 19:41:12 +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 26TJfCEX007365; Fri, 29 Jul 2022 19:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TJfCmw007364; Fri, 29 Jul 2022 19:41:12 GMT (envelope-from git) Date: Fri, 29 Jul 2022 19:41:12 GMT Message-Id: <202207291941.26TJfCmw007364@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: f946e1f195eb - stable/12 - Revert "Fix unused variable warning in ffs_snapshot.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/12 X-Git-Reftype: branch X-Git-Commit: f946e1f195ebca6b2391bb3f106756e1f1cc08e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659123672; 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=tX5UJUqpOm+w+KZzq6EmV+p5xOhtY3i+kEMfYWA05E4=; b=AAKSRivB+ZAwEu27ZOY8iLL0+KBoaEkuCoxO13Z1IWXmpq7+FCQdbUKxC2wHY6usExoK7x EgAeGtFsoZ8AQavgRiktXwNM1gP1GpZqp3D8RM2DZZSpQs+ade7cX6TyuzKHB5JA6pqQ4m mf5hcuKWkddR/AG4Pnm+VlVF8m6qbj1Gw/OUKOuJwPJt4YilmbwTNzkVSXKjKO22723sMR t5wNYOfv9Em6Ur5RYQ1hFKpiNE2v7nL0Nq64uDBrxlVA0/TKrUj4G+LQY+O1mC66AKHdpd V1otXVyjfiVVU0w5IwyEXVLKSDwX3t5F+WEvq4qjQIYo6xWtxmiSyKRiGYfMwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659123672; a=rsa-sha256; cv=none; b=Tv5XsPgQb90bRjPij51gzmtTPtolh14DDncJjvaCV7sUcr8Q5r5qAZNvxGAeGBnTPDtL8I BUmQP+ekmPLgsEXyrjvRVKeat22CfXbTjofmhjaOJWaHdBMhmHRrc8SrjT/i7YvFtHA36T vfgVjACDzjnAVcG5D7ad+xL0e1W0MzlK/NqgAsfx+KZK9YnPRPARMko5N0G08lZlLWj6eq FyRXi5YzwHEa51DQCFXfppoZtSCz6YtQI3fpuE+PnQsBQWFDvcu4CZEuj7Fr/kYRqzFxjh qIlHAcraI2zFAefa8tJiTkh6pvyUfgsURThKiB/r9DWfZmg38xVe3tJwVacb1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f946e1f195ebca6b2391bb3f106756e1f1cc08e0 commit f946e1f195ebca6b2391bb3f106756e1f1cc08e0 Author: Dimitry Andric AuthorDate: 2022-07-29 19:38:26 +0000 Commit: Dimitry Andric CommitDate: 2022-07-29 19:38:26 +0000 Revert "Fix unused variable warning in ffs_snapshot.c" This reverts commit 6ef6d3424f158a797d280ebd3103d4d833d41230. The ffs_snapshot.c code in stable/12 is pretty far behind, and merging all the additional changesets needed is too much churn. --- sys/ufs/ffs/ffs_snapshot.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index 1700a4094ae7..a65616fd04e0 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -214,10 +214,7 @@ ffs_snapshot(mp, snapfile) uint64_t flag; struct timespec starttime = {0, 0}, endtime; char saved_nice = 0; -#ifdef DIAGNOSTIC - long redo = 0; -#endif - long snaplistsize = 0; + long redo = 0, snaplistsize = 0; int32_t *lp; void *space; struct fs *copy_fs = NULL, *fs; @@ -460,9 +457,7 @@ 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)