Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jan 2025 08:48:50 GMT
From:      Kirk McKusick <mckusick@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 256389eaf158 - main - Fix build from aa90fbed151de5 by eliminating an unused variable.
Message-ID:  <202501280848.50S8movd021988@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mckusick:

URL: https://cgit.FreeBSD.org/src/commit/?id=256389eaf158acaf67f0530764be8af68edee78c

commit 256389eaf158acaf67f0530764be8af68edee78c
Author:     Kirk McKusick <mckusick@FreeBSD.org>
AuthorDate: 2025-01-28 08:47:31 +0000
Commit:     Kirk McKusick <mckusick@FreeBSD.org>
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501280848.50S8movd021988>