From nobody Wed Oct 15 07:25:26 2025 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 4cmjKg0bwkz6Csbq; Wed, 15 Oct 2025 07:25:27 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cmjKf55vfz3RlD; Wed, 15 Oct 2025 07:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760513126; 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=Q42l99J7mKJGFsEfnA/xKrQfklxRB0kCl4OySdj1zec=; b=KOdOL4K07tY8eyD0oDztoLgBCKWuR0UcIOlgkSL0m2G4ylBlMiBjkckyW7GmBEVt0s/P1l +jAFiVZI0YyBaiuJ69T/sKpD/Mw/xh5DpaczmrxKcwGfgVNrrCwMsCYBw3W9IslFqXnkPG oKIeXtghwb/yp9yLTjiGHWXdwn8DJuCfSNiVrkYKPsjk8mY4Qw4vdYEv+cDTFHH/AOBJx6 DfWkpw15zjP2otVdFF9SN8cQ+9CfLfwkXC6MlE0dE7oHWShGW6IzslvwIA/GFgrBT2kYJZ /MHCAI1y8WCOuNInSePGmU4YPO0kCkZ1y9s5qGjEBrnesYVW1+rYYRQgngm7kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760513126; 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=Q42l99J7mKJGFsEfnA/xKrQfklxRB0kCl4OySdj1zec=; b=rRYLn7EABUoN+cOh0JVF0ttl0Yt15Ph+fECxuS9/wlJKMGxc4ClhFc0X/B8i+1/qf+M/HX KcPQWdVPhQC5RfevKzSqpaos50fvOHzRS15AhT7KstsRjMJChQoIRkvN45Uw/dSIT8X3q9 khtY/eqA7FzWPUupy5jFyQdXd7lHDQzD4AQLlsF7p0BISchu6Q5EkjmMH2Qyslu3bMWhs+ 6cQrKaZppjmFCG3TcI35mu4hRQ2T4Hw5AThI7W195Tfsjmu49zY/3iyReuT5sjb4QD9tkz 3Q2BCCaGt4puGHYzKdLCU+aNXZD4UuQOnld+2pcDXaHuD/PsEO97QASaoyBDNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760513126; a=rsa-sha256; cv=none; b=OCi4fVhiTickAhZa46ePuBuuzmcpUjxxY4c0ZK4tnhSf96x2r+dOu7vmk2yNX+ubQ4Qtlp 7ehqLlkHdosHer/pFyqEet+KHZX2mFmXd4uPR9vIOnyV/J9JL9OYACuSL3H4ePHWvEMdLg 69e4K0ZmnhMZPwRpbMkfC83c1ndAUW/tqAxvUBmR1GFjUKwa/YczUkYrZjgzrCDXIKII4g ue+W+WQDiZ+EZQ2gsEqRXyLy5vABo4/WtOFWSfkSNG6r82y3rKMdP1jfOaY7ZNAjipLZTV idvLM5rz5kjHfV3PpndWz4N+XtnUGjcpkhVaIOxZtbqKLFzxlC7nI1Izt6jYFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cmjKf3QWLzDL4; Wed, 15 Oct 2025 07:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59F7PQw5072430; Wed, 15 Oct 2025 07:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59F7PQC1072427; Wed, 15 Oct 2025 07:25:26 GMT (envelope-from git) Date: Wed, 15 Oct 2025 07:25:26 GMT Message-Id: <202510150725.59F7PQC1072427@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: b679303544b3 - main - fsck_ffs: garbage collect calcsb 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b679303544b37b980a3128af9248ee97b0bca5e8 Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=b679303544b37b980a3128af9248ee97b0bca5e8 commit b679303544b37b980a3128af9248ee97b0bca5e8 Author: Ryan Libby AuthorDate: 2025-10-15 04:03:57 +0000 Commit: Ryan Libby CommitDate: 2025-10-15 04:03:57 +0000 fsck_ffs: garbage collect calcsb calcsb is unused since the logic moved to sbsearch / ffs_sbsearch in e68866164212 ("Move the ability to search for alternate UFS superblocks from fsck_ffs(8) into ffs_sbsearch() to allow use by other parts of the system.") Reviewed by: mckusick Differential Revision: https://reviews.freebsd.org/D53038 --- sbin/fsck_ffs/setup.c | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index f10f02d159c3..41b4a5336350 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -58,7 +58,6 @@ char *copybuf; /* buffer to copy snapshot blocks */ static int sbhashfailed; #define POWEROF2(num) (((num) & ((num) - 1)) == 0) -static int calcsb(char *dev, int devfd, struct fs *fs); static void saverecovery(int readfd, int writefd); static int chkrecovery(int devfd); static int getlbnblkno(struct inodesc *); @@ -500,52 +499,6 @@ sblock_init(void) dev_bsize = secsize = DEV_BSIZE; } -/* - * Calculate a prototype superblock based on information in the boot area. - * When done the cgsblock macro can be calculated and the fs_ncg field - * can be used. Do NOT attempt to use other macros without verifying that - * their needed information is available! - */ -static int -calcsb(char *dev, int devfd, struct fs *fs) -{ - struct fsrecovery *fsr; - char *fsrbuf; - u_int secsize; - - /* - * We need fragments-per-group and the partition-size. - * - * Newfs stores these details at the end of the boot block area - * at the start of the filesystem partition. If they have been - * overwritten by a boot block, we fail. But usually they are - * there and we can use them. - */ - if (ioctl(devfd, DIOCGSECTORSIZE, &secsize) == -1) - return (0); - fsrbuf = Balloc(secsize); - if (fsrbuf == NULL) - errx(EEXIT, "calcsb: cannot allocate recovery buffer"); - if (blread(devfd, fsrbuf, - (SBLOCK_UFS2 - secsize) / dev_bsize, secsize) != 0) { - free(fsrbuf); - return (0); - } - fsr = (struct fsrecovery *)&fsrbuf[secsize - sizeof *fsr]; - if (fsr->fsr_magic != FS_UFS2_MAGIC) { - free(fsrbuf); - return (0); - } - memset(fs, 0, sizeof(struct fs)); - fs->fs_fpg = fsr->fsr_fpg; - fs->fs_fsbtodb = fsr->fsr_fsbtodb; - fs->fs_sblkno = fsr->fsr_sblkno; - fs->fs_magic = fsr->fsr_magic; - fs->fs_ncg = fsr->fsr_ncg; - free(fsrbuf); - return (1); -} - /* * Check to see if recovery information exists. * Return 1 if it exists or cannot be created.