From nobody Fri Aug 11 05:39:50 2023 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 4RMXgB6RXrz4mH5t; Fri, 11 Aug 2023 05:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMXgB5vTZz4dK6; Fri, 11 Aug 2023 05:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691732390; 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=R3z95KS8r1iVxS3SWEjJ8rt5gTB9tp+SFPUEkkFX41k=; b=SiXoENPC/tjnHNjB8ERIksfmPCHp+8oMz8vGDE5PztA5hace9pnWw8paWYjbgGD0Df0Bw5 9q4LdCFwbjChc5BEnZ6Rgm4IL/5potw3iyWN5Fc7b7i9ROLbcewjF3W3vf7NqZjyuNAdr2 0eN2qNvpurbwTa8Z7wtnfZtwk8B6qn7ayKNyTcNp1Zj7qaINbjnmn9iT9pncawUt0lVJKs r2wM3y0eekXC65NhotYLLpoPDRFod79zRyefM8DPOjGD3t5z9Fx1ZLBzco/rtu+RUCRElL 9YU48LjOMCJfAX55JJ+h4a1fKazhrLVCqPW2ukyEEqbuw3uhamhIncRAfVsATg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691732390; 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=R3z95KS8r1iVxS3SWEjJ8rt5gTB9tp+SFPUEkkFX41k=; b=bpKsPodwC3caYO9rO2xrYH5EFKdcXfwgC1TJ4H1oHVIjtFj6FLclz0FWdGKfR8yJmcxAeQ oz0MvIxx/JppOOBA8N6nNBn9ZjkZ6wa927xDpn+H7nyAHTRt5lunax7vOiba5/y77lCz5y MLlCCZLNhQ8xKwGXbPnlW75E/h7FEs0ggS/MlyBGo4ePQURsTc+dYRnpOesvS7sxMYBLfL TqtfpRgNIKvLG+gfaIYnLGbw9IhHKK8qQXluD9sHU8v9fQL8IOr4vvzP0IWMhLAR4xVwsu wwpPayGvZSpoD7+C6saoM4pIcbr6soHuGBBvi9jU71PReGaNWee4XICxajg+dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691732390; a=rsa-sha256; cv=none; b=qeNl5zFAoJ97mJwoi2wXQVXIGNRuYVC9YjaaCTDXm724wJ3OFR/NCn2rB4ujxRNxGewbVS i/K+X8BkJNP8DShnV2ewim7erpk/LzMRNVB1UYqWhaT2+dDiM2mfgKzIX9XbhFf8FsUKFg VfMsBkwqWn7n0esrSgS3lEqi0ZBV6WBZIjCH1/GXgty4cAWegGK6j2dPmiuvo+BkjX3h09 CfrmluyIa50QwdgEmgNM3Fa57QAGbXcVI0v3pHGFCe0FtboZfESwjwRw3MbRsUlCfNYt9z XadeQYADwXHUSWN4qDaDyN2OF5/NXYJWVq7QGyp96Tprz7lBbFRdKpG5MwB9Ww== 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 4RMXgB4n4mzCVb; Fri, 11 Aug 2023 05:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37B5dooL043772; Fri, 11 Aug 2023 05:39:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B5dofK043770; Fri, 11 Aug 2023 05:39:50 GMT (envelope-from git) Date: Fri, 11 Aug 2023 05:39:50 GMT Message-Id: <202308110539.37B5dofK043770@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: 677023529d6a - main - Cleanups to UFS/FFS ffs_checkblk(). 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 677023529d6a46da52ed780eb299c6754a75f6ef Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=677023529d6a46da52ed780eb299c6754a75f6ef commit 677023529d6a46da52ed780eb299c6754a75f6ef Author: Kirk McKusick AuthorDate: 2023-08-11 05:38:56 +0000 Commit: Kirk McKusick CommitDate: 2023-08-11 05:39:35 +0000 Cleanups to UFS/FFS ffs_checkblk(). Rename to ffs_checkfreeblk() to better describe that it is checking to find out if a block or fragment is free. Clarify its implementation. No functional change intended. MFC-after: 1 week Sponsored-by: The FreeBSD Foundation --- sys/ufs/ffs/ffs_alloc.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index f6bf4c1dadc0..166c5bc7c65c 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -114,7 +114,7 @@ static void ffs_blkfree_cg(struct ufsmount *, struct fs *, struct vnode *, ufs2_daddr_t, long, ino_t, struct workhead *); #ifdef INVARIANTS -static int ffs_checkblk(struct inode *, ufs2_daddr_t, long); +static int ffs_checkfreeblk(struct inode *, ufs2_daddr_t, long); #endif static ufs2_daddr_t ffs_clusteralloc(struct inode *, uint64_t, ufs2_daddr_t, int); @@ -600,7 +600,7 @@ ffs_reallocblks_ufs1( end_lbn = start_lbn + len - 1; #ifdef INVARIANTS for (i = 0; i < len; i++) - if (!ffs_checkblk(ip, + if (!ffs_checkfreeblk(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 1"); for (i = 1; i < len; i++) @@ -721,7 +721,7 @@ ffs_reallocblks_ufs1( soff = -i; } #ifdef INVARIANTS - if (!ffs_checkblk(ip, + if (!ffs_checkfreeblk(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 2"); if (dbtofsb(fs, buflist->bs_children[i]->b_blkno) != *bap) @@ -804,7 +804,8 @@ ffs_reallocblks_ufs1( NOTRIM_KEY : SINGLETON_KEY); bp->b_blkno = fsbtodb(fs, blkno); #ifdef INVARIANTS - if (!ffs_checkblk(ip, dbtofsb(fs, bp->b_blkno), fs->fs_bsize)) + if (!ffs_checkfreeblk(ip, dbtofsb(fs, bp->b_blkno), + fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 3"); #endif #ifdef DIAGNOSTIC @@ -865,7 +866,7 @@ ffs_reallocblks_ufs2( end_lbn = start_lbn + len - 1; #ifdef INVARIANTS for (i = 0; i < len; i++) - if (!ffs_checkblk(ip, + if (!ffs_checkfreeblk(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 1"); for (i = 1; i < len; i++) @@ -985,7 +986,7 @@ ffs_reallocblks_ufs2( soff = -i; } #ifdef INVARIANTS - if (!ffs_checkblk(ip, + if (!ffs_checkfreeblk(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 2"); if (dbtofsb(fs, buflist->bs_children[i]->b_blkno) != *bap) @@ -1068,7 +1069,8 @@ ffs_reallocblks_ufs2( NOTRIM_KEY : SINGLETON_KEY); bp->b_blkno = fsbtodb(fs, blkno); #ifdef INVARIANTS - if (!ffs_checkblk(ip, dbtofsb(fs, bp->b_blkno), fs->fs_bsize)) + if (!ffs_checkfreeblk(ip, dbtofsb(fs, bp->b_blkno), + fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 3"); #endif #ifdef DIAGNOSTIC @@ -2285,7 +2287,7 @@ ffs_blkfree_cg(struct ufsmount *ump, printf("dev=%s, bno = %jd, bsize = %ld, size = %ld, fs = %s\n", devtoname(dev), (intmax_t)bno, (long)fs->fs_bsize, size, fs->fs_fsmnt); - panic("ffs_blkfree_cg: bad size"); + panic("ffs_blkfree_cg: invalid size"); } #endif if ((uint64_t)bno >= fs->fs_size) { @@ -2748,11 +2750,11 @@ ffs_blkfree(struct ufsmount *ump, #ifdef INVARIANTS /* - * Verify allocation of a block or fragment. Returns true if block or - * fragment is allocated, false if it is free. + * Verify allocation of a block or fragment. + * Return 1 if block or fragment is free. */ static int -ffs_checkblk(struct inode *ip, +ffs_checkfreeblk(struct inode *ip, ufs2_daddr_t bno, long size) { @@ -2760,34 +2762,34 @@ ffs_checkblk(struct inode *ip, struct cg *cgp; struct buf *bp; ufs1_daddr_t cgbno; - int i, error, frags, free; + int i, error, frags, blkalloced; uint8_t *blksfree; fs = ITOFS(ip); if ((uint64_t)size > fs->fs_bsize || fragoff(fs, size) != 0) { printf("bsize = %ld, size = %ld, fs = %s\n", (long)fs->fs_bsize, size, fs->fs_fsmnt); - panic("ffs_checkblk: bad size"); + panic("ffs_checkfreeblk: bad size"); } if ((uint64_t)bno >= fs->fs_size) - panic("ffs_checkblk: bad block %jd", (intmax_t)bno); + panic("ffs_checkfreeblk: too big block %jd", (intmax_t)bno); error = ffs_getcg(fs, ITODEVVP(ip), dtog(fs, bno), 0, &bp, &cgp); if (error) - panic("ffs_checkblk: cylinder group read failed"); + panic("ffs_checkfreeblk: cylinder group read failed"); blksfree = cg_blksfree(cgp); cgbno = dtogd(fs, bno); if (size == fs->fs_bsize) { - free = ffs_isblock(fs, blksfree, fragstoblks(fs, cgbno)); + blkalloced = ffs_isblock(fs, blksfree, fragstoblks(fs, cgbno)); } else { frags = numfrags(fs, size); - for (free = 0, i = 0; i < frags; i++) + for (blkalloced = 0, i = 0; i < frags; i++) if (isset(blksfree, cgbno + i)) - free++; - if (free != 0 && free != frags) - panic("ffs_checkblk: partially free fragment"); + blkalloced++; + if (blkalloced != 0 && blkalloced != frags) + panic("ffs_checkfreeblk: partially free fragment"); } brelse(bp); - return (!free); + return (blkalloced == 0); } #endif /* INVARIANTS */