From nobody Tue Jan 28 08:48:50 2025 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 4YhzTt3R6Nz5mH4g; Tue, 28 Jan 2025 08:48:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YhzTt2mSyz3ftw; Tue, 28 Jan 2025 08:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738054130; 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=XkkQaevZjhulbxfrksQwAREkluLkKciWULjMWnw08II=; b=p741jYr2D5TNu+7Y/G8DnhA+nCl9jgJy3euwMsti7FZbqPJSFhkWfTDReUwzWJPX7fLwzg DVfUGkz1e7tibUxpKNmzDcMAXzIgUkYqXk+xm1cEvTHBR5HIqzPozh4i+LopxkM4RWSDyi ApIxdSP/EwBps2X4uxtA2nf32d2ZEsI0htIi4/7aI94qXGoPejl4BScMQtEbphlMwKls8O POkZ0AlLKcjDCbowbpaW4UIdMSwwQXxHuqaLFprNqmi3iNeIuDRW58jDUe3d9dh954uUEm ojV/umxoCWpU+KjPNtrA1SvnM3VF8JS2IyQy1CSjGKfjiklifHINRIQw6bIp0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738054130; 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=XkkQaevZjhulbxfrksQwAREkluLkKciWULjMWnw08II=; b=HtNMHyWNAyU+qXOnS2+YYlM0Of9F9c6tCtolV7sRp7Bu7LoVYVFMXme6NOY3WA4HtFNTkp VmDx2yKPodc9SzjxFF7Z61c5KxjuoulmXivwgMleSjjrM8RMi9Sf2bN4ii1VJMucRCGAXZ pL9BCUbfGaBm0vlTePeManCUqHmhpo8nAqoFhqDb1DEM6w4IP9HHfWAQEUpCgvUK0Vtt5p A5cYzB9UburEWjrJU1q5ttVP46tUHUNIdRE8refJGwzJoisQM9x/rnUP+3vlvqNFByNeC7 UJpBrJzesnUguuDYNc+zx8tp2i6Cks5agPDS51RqyfkYBHChOjsXQ+1pxuObQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738054130; a=rsa-sha256; cv=none; b=LWg0jDaBITtjmA64NnRHjf2x2bsYD36BAq3uxSkJizAth1Otk1mZpcXBnrRAs/cOBYL5X1 0Am0psVUIyklD3GXcrYwDc5xAMWrLaDZTu9a33AJwV8+ivyPzyOJNA1dP72DSWE75cTZTY fRtHQOO4sMV0b6wOt3+uqJR8RaTxJ8AszzsdfDcjq0LHUOmsgJCjphhcKBDOceGf+Nog4g NaB4lIeLBYxM9uxWtreJD5tXHg5FNJGnLJ1BirwZUG5A60nxUFdTm6MjkdhicfBN6Iz3uc Vxz8Mfk2HOMJWcSki48jP20+Py+mJnvjuTpUcdVa0Z0sh+KwmNpCDHjZXXuoOg== 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 4YhzTt2HnVz16qD; Tue, 28 Jan 2025 08:48:50 +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 50S8modq021991; Tue, 28 Jan 2025 08:48:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50S8movd021988; Tue, 28 Jan 2025 08:48:50 GMT (envelope-from git) Date: Tue, 28 Jan 2025 08:48:50 GMT Message-Id: <202501280848.50S8movd021988@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 256389eaf158 - main - Fix build from aa90fbed151de5 by eliminating an unused variable. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 256389eaf158acaf67f0530764be8af68edee78c Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=256389eaf158acaf67f0530764be8af68edee78c commit 256389eaf158acaf67f0530764be8af68edee78c Author: Kirk McKusick AuthorDate: 2025-01-28 08:47:31 +0000 Commit: Kirk McKusick CommitDate: 2025-01-28 08:48:42 +0000 Fix build from aa90fbed151de5 by eliminating an unused variable. --- sbin/fsck_ffs/inode.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index dca479f43831..c3ae283b7198 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -429,7 +429,6 @@ void ginode(ino_t inumber, struct inode *ip) { ufs2_daddr_t iblk; - union dinodep dpp; struct ufs2_dinode *dp; if (inumber < UFS_ROOTINO || inumber >= maxino) @@ -467,12 +466,10 @@ ginode(ino_t inumber, struct inode *ip) if (sblock.fs_magic == FS_UFS1_MAGIC) { ip->i_dp = (union dinode *) &ip->i_bp->b_un.b_dinode1[inumber - ip->i_bp->b_index]; - dpp.dp1 = (struct ufs1_dinode *)ip->i_dp; return; } ip->i_dp = (union dinode *) &ip->i_bp->b_un.b_dinode2[inumber - ip->i_bp->b_index]; - dpp.dp2 = dp = (struct ufs2_dinode *)ip->i_dp; /* Do not check hash of inodes being created */ if (dp->di_mode != 0 && ffs_verify_dinode_ckhash(&sblock, dp)) { pwarn("INODE CHECK-HASH FAILED"); @@ -522,7 +519,6 @@ getnextinode(ino_t inumber, int rebuiltcg) mode_t mode; ufs2_daddr_t ndb, blk; union dinode *dp; - union dinodep dpp; struct inode ip; static caddr_t nextinop; @@ -555,10 +551,8 @@ getnextinode(ino_t inumber, int rebuiltcg) dp = (union dinode *)nextinop; if (sblock.fs_magic == FS_UFS1_MAGIC) { nextinop += sizeof(struct ufs1_dinode); - dpp.dp1 = (struct ufs1_dinode *)dp; } else { nextinop += sizeof(struct ufs2_dinode); - dpp.dp2 = (struct ufs2_dinode *)dp; } if ((ckhashadd & CK_INODE) != 0) { ffs_update_dinode_ckhash(&sblock, (struct ufs2_dinode *)dp);