From nobody Thu Mar 20 20:37:42 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 4ZJcpH183Tz5rLmy; Thu, 20 Mar 2025 20:37:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJcpH0B20z3v13; Thu, 20 Mar 2025 20:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742503063; 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=smXDMqGWDm+xAxV2kjFVH0CsXgNQPGrfPC+X+CyB2po=; b=ZiwNhIfFLT2+ty2NLTNTnzolNo0xM+yWNeyZppjctV06CkCnlBT1zIzNDcHFiqd9yJYjs0 I2DlY5cei4u9sjyIe2aJjvgc2ei0DT/gyk89ImlYB0OypmRCgjPJZRJZXLE39h7tH4s1FF F2Ie2kRLzz3n+5OlA6935yOqOUNu1s0T17ALzKHFa1Lz0Y3VDNQz/5keQ4rxjfOmeRNVuF qHd/hfWpOLk/NS6yNXg+pRaH64k4QQO7dudq8qV+phJDRFnp9MU0tFykd71qICRUOcBxoA wgZpFKrvmt6RF6Eg8G+7vaJyEokjUStkgqvbs6YPcohE3otEyIO5qPN/uEuUbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742503063; a=rsa-sha256; cv=none; b=vl419+UqmnMih5NZSWKbNIJQue/MB0OWXmtY1PxxHdoPOl76qH3LvylmgpI5Jadz/WzMW/ zatNFnBpkyzTUNknY86UY8Hi/zweea0vZVuhSfQfGz7mhbKV9iWi/wRGQx16SQGI/gYUZ8 mDUQbXY4uLrWeEFuDG/d7Easo8DCavI4p1LbPv10E0a30BjqSnVHSnYXe3ntvY64jrWadW GtGfIR4lo34tqmVryto5g2/tRC4FpW6JMcIRUELY9ow61x6GKC8Tb6W4MW9/DzM4S0CBZP ZvoOtMXYKpXgGAKa7sSdNOaSqndW4tMjOb/KkqCk4A5DhZut9g7woSNrAgSTRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742503063; 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=smXDMqGWDm+xAxV2kjFVH0CsXgNQPGrfPC+X+CyB2po=; b=YkoUdE6tohh8j74RKvimJqysqteKPCqVcbqCcGx8gR7+MRKedaC3d/nZ40E1MvJOw9kVuE tLesltYjY00KmhB9mHnFUfzAt4YKPBeRTLjOfuGAS0zOOW2DpCP4PFpQmHrQeNht8rvTUG ypGUMGz+hvX3t2D/hZgtIEY+mTNw+9LtyeUfte/9u4QwuYubzNR0jcIv7OBbyBvLAexEzn kWEs2r7PEkp9xhiRx0h8BXKuR/lyN6sXumAO+Px4aA9mGvtjUoRmKQdHwp5bxO6NBrUWyu a2m6CS/GqYNvVSqopNjMw9Jy7TQHdEtrg/ywi7CNSsT6uO47jHmri/iCbvPJXg== 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 4ZJcpG6nmMz1KPQ; Thu, 20 Mar 2025 20:37:42 +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 52KKbgB7040252; Thu, 20 Mar 2025 20:37:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KKbgCa040249; Thu, 20 Mar 2025 20:37:42 GMT (envelope-from git) Date: Thu, 20 Mar 2025 20:37:42 GMT Message-Id: <202503202037.52KKbgCa040249@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: 16649530b7be - main - Formatting and style cleanups. 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: 16649530b7be02a61a32b34d56e6e937734cd247 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=16649530b7be02a61a32b34d56e6e937734cd247 commit 16649530b7be02a61a32b34d56e6e937734cd247 Author: Kirk McKusick AuthorDate: 2025-03-20 20:36:48 +0000 Commit: Kirk McKusick CommitDate: 2025-03-20 20:37:23 +0000 Formatting and style cleanups. No functional change intended. MFC-after: 1 week Sponsored-by: Netflix --- sys/ufs/ffs/ffs_subr.c | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 67c423d3127c..682dd60ebd44 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -340,31 +340,36 @@ ffs_oldfscompat_read(struct fs *fs, ufs2_daddr_t sblockloc) fs->fs_old_flags |= FS_FLAGS_UPDATED; fs->fs_sblockloc = sblockloc; } - /* - * If not yet done, update UFS1 superblock with new wider fields. - */ - if (fs->fs_magic == FS_UFS1_MAGIC && fs->fs_maxbsize != fs->fs_bsize) { - fs->fs_maxbsize = fs->fs_bsize; - fs->fs_time = fs->fs_old_time; - fs->fs_size = fs->fs_old_size; - fs->fs_dsize = fs->fs_old_dsize; - fs->fs_csaddr = fs->fs_old_csaddr; - fs->fs_cstotal.cs_ndir = fs->fs_old_cstotal.cs_ndir; - fs->fs_cstotal.cs_nbfree = fs->fs_old_cstotal.cs_nbfree; - fs->fs_cstotal.cs_nifree = fs->fs_old_cstotal.cs_nifree; - fs->fs_cstotal.cs_nffree = fs->fs_old_cstotal.cs_nffree; - } - if (fs->fs_magic == FS_UFS1_MAGIC && - fs->fs_old_inodefmt < FS_44INODEFMT) { - fs->fs_maxfilesize = ((uint64_t)1 << 31) - 1; - fs->fs_qbmask = ~fs->fs_bmask; - fs->fs_qfmask = ~fs->fs_fmask; - } - if (fs->fs_magic == FS_UFS1_MAGIC) { + switch (fs->fs_magic) { + case FS_UFS2_MAGIC: + /* No changes for now */ + break; + + case FS_UFS1_MAGIC: + /* + * If not yet done, update UFS1 superblock with new wider fields + */ + if (fs->fs_maxbsize != fs->fs_bsize) { + fs->fs_maxbsize = fs->fs_bsize; + fs->fs_time = fs->fs_old_time; + fs->fs_size = fs->fs_old_size; + fs->fs_dsize = fs->fs_old_dsize; + fs->fs_csaddr = fs->fs_old_csaddr; + fs->fs_cstotal.cs_ndir = fs->fs_old_cstotal.cs_ndir; + fs->fs_cstotal.cs_nbfree = fs->fs_old_cstotal.cs_nbfree; + fs->fs_cstotal.cs_nifree = fs->fs_old_cstotal.cs_nifree; + fs->fs_cstotal.cs_nffree = fs->fs_old_cstotal.cs_nffree; + } + if (fs->fs_old_inodefmt < FS_44INODEFMT) { + fs->fs_maxfilesize = ((uint64_t)1 << 31) - 1; + fs->fs_qbmask = ~fs->fs_bmask; + fs->fs_qfmask = ~fs->fs_fmask; + } fs->fs_save_maxfilesize = fs->fs_maxfilesize; maxfilesize = (uint64_t)0x80000000 * fs->fs_bsize - 1; if (fs->fs_maxfilesize > maxfilesize) fs->fs_maxfilesize = maxfilesize; + break; } /* Compatibility for old filesystems */ if (fs->fs_avgfilesize <= 0) @@ -426,9 +431,8 @@ static int prttimechgs = 0; #ifdef _KERNEL SYSCTL_NODE(_vfs, OID_AUTO, ffs, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "FFS filesystem"); - SYSCTL_INT(_vfs_ffs, OID_AUTO, prttimechgs, CTLFLAG_RWTUN, &prttimechgs, 0, - "print UFS1 time changes made to inodes"); + "print UFS1 time changes made to inodes"); #endif /* _KERNEL */ bool ffs_oldfscompat_inode_read(struct fs *fs, union dinodep dp, time_t now)