From nobody Sun Aug 20 04:28:26 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 4RT2ff4bTLz4qgnN; Sun, 20 Aug 2023 04:28:26 +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 4RT2ff3p5Rz4QXC; Sun, 20 Aug 2023 04:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505706; 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=yHtjcwVAkuCuYZmAoennhMXZsZcLnKEsoX5sY/z+Cn4=; b=w1iY+Rz2Pelg52v5IzNe8HsYLV7hDb+LiIYd1tKfQbpIspXVrPvJpr3rBCv2aEJoxrQp15 F7AuKlmcgnh6U3A0O44IJdp4WCvihvk/hnI+nJrGMMymNQIDKhVoW3zNi+X9rb2r+gP0p0 4KhIdH6AJqeKOkO+wR570Jg0wkQH1KN54gt/uQ6t+rASgPzNA/gKaSeI3U5Dh1BkMQYk2J yxabNkcnhTgYJcS1+Y7KskXvNrpVZM0HUib6sD/T04i0BIl09Dl/75hXPIJBvrZZbaOPWg IeBTz9lJLET8JMpHNlKIuBeXab+hSpv+JrO/UGRQVpffiNt6feiW/IO9N5HwRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692505706; 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=yHtjcwVAkuCuYZmAoennhMXZsZcLnKEsoX5sY/z+Cn4=; b=kcsPzGObBG4HLUGAG9hTqZMy6olv32LC1c/3q4TLT7pAKCE2AwPa4TNEAQLdaPeD9N0IZK w+iIh3R3FRAbEO7ksKz7oNGyfU5QGDh8jm+RxNdLsbChRlyCCC5cne8AN+6suZDGq3AJ8x x6Uewp8pzj+daTVTlBaSwC3lnBgu2elS8fNLO1krtNMuwCIRSWeoytluILX5AVr9nbzb0w 9BId/6ejw3iNX4HQQY4fpDoMLcbvAGiFuSd5nWznrRsH5YkyUzxhEbkD+mubSubY24MYxo xM38t182xyZPr2JpvGHUkLRtpjbReS46HFKex1ldeAToDKe5KKSnEqvkm4/hKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692505706; a=rsa-sha256; cv=none; b=EHhyrrZ0pVIgFwd1dvUsUkFZHeZ2CJIQYfqkyzUvkrrYFXwp+sY08MSgD++HKNl8QX096e Gg5jFa0kSs0WRwNWJgIBycNeYXvFDWGSgJczXN7BHokMQq8DCEZQm0TE3gZkQbHCLt07yh 6f6Y1GosLShUvPUDbJbKcGhyUtWSjXbyK6fjXhz6iFGrPHxJj5rS4RYJE/HP8hAJ1KpitA IYvvdCZE/MPr/iDGGrwBRTQEFISimmPP/DR5zX3nDOBg8jXL/DOGUDjpIBkzbXb57r0bHU PTUy8hBsh1e/e1cYTFGT6WTt0rkAJ/ZkJQBIyZb30891GSyAxzvS9rOhRVJhNQ== 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 4RT2ff2v0hz94g; Sun, 20 Aug 2023 04:28:26 +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 37K4SQvP033693; Sun, 20 Aug 2023 04:28:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K4SQB1033690; Sun, 20 Aug 2023 04:28:26 GMT (envelope-from git) Date: Sun, 20 Aug 2023 04:28:26 GMT Message-Id: <202308200428.37K4SQB1033690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 7f65ff3d8854 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 7f65ff3d8854026cce3428eab1ec9afedf1112a8 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=7f65ff3d8854026cce3428eab1ec9afedf1112a8 commit 7f65ff3d8854026cce3428eab1ec9afedf1112a8 Author: Kirk McKusick AuthorDate: 2023-08-11 05:38:56 +0000 Commit: Kirk McKusick CommitDate: 2023-08-20 04:27:38 +0000 Cleanups to UFS/FFS ffs_checkblk(). No functional change intended. Sponsored-by: The FreeBSD Foundation (cherry picked from commit 677023529d6a46da52ed780eb299c6754a75f6ef) --- 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 35c8662307c6..04dbfd90dee4 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 */