From nobody Thu Mar 17 12:28:13 2022 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 CF2101A25A21; Thu, 17 Mar 2022 12:28:14 +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 4KK5yj3d6Tz4r8X; Thu, 17 Mar 2022 12:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647520094; 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=owuESxm/ED5XMfido3hp96M0wfi97qtekkZIq0GrlTE=; b=It1juaCud79d8d2FkFCk7kJ7zDeyCaYl9elGB4fDMyb1A5BTli8nNpcUx1jVaEQcoN4m/Q d8fa1e6meVyqZ3TRK0sXUWxy187MfPXgZ6ljEocz/doDtVcHVeq54NfJA63SBsCrL97OOP PL/1fYkcD4pOjx+td+FrrPjwvoYnFHEq6x2d3BNVoDrdH+iKcy5uh6x3TtCaDVpIK8mxu5 xuPBm+ZZWqY9W6i2cizWwkR4GopBKccn0fCbQW4K3EX6yUw4/S88Rh0T7fiHRh+vzo50Pp IcRKwdCkXh0Q65G7++6F3HgQS19AtwesU+kGCz9x46ud6gxlrVwKX/56o3GpbA== 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 4A57525E2; Thu, 17 Mar 2022 12:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22HCSDwG083909; Thu, 17 Mar 2022 12:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HCSDQX083908; Thu, 17 Mar 2022 12:28:13 GMT (envelope-from git) Date: Thu, 17 Mar 2022 12:28:13 GMT Message-Id: <202203171228.22HCSDQX083908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: a14408a53162 - releng/13.1 - newfs(8): Fix a bug in initialization of sblock.fs_maxbsize . 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: a14408a53162c2e836dec5f60cb9e8949391f48f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647520094; 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=owuESxm/ED5XMfido3hp96M0wfi97qtekkZIq0GrlTE=; b=ojVC7/E7m5NRVfDakZvhuY2Qe3v3pm8ZfxFs1OfBeRJpcKhNIs00uFjhQIDFwpSQOrbQri 9A5dd+0fxFSvTLV9WUWE3LsCuEfokotm1L1jhN7hu3JQEODQC/WFYOMbnmlc+LFYxaxWZt z5iu/Ra3SEPWmEJnTpIxhwrHJ4J6P8+sOcPCnEZm2VC63H8xtQ35XtiZA8aBaNp64i/McD opzomBbgn+KEaqngBQx65C5jQ+ZNScBG3MH1UQBVmWGodq6wgg7nOllSH57j7XRSp1M5bc mgms96a1ARpiN5rm423ejqgCOoKwj6RcsIXbiljYrPGVE4i+obW5Cw5/Rm3LGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647520094; a=rsa-sha256; cv=none; b=bgLoQqJc8F7CY+aIIqfCp8klX1FXILEuljj0Nrb0EXvTcKd277Gs4pkMSBUO5m3TC1tn/p s0lvMOlfdgEQeYH8h/ZePtDWjhThPPwxLfhZEBuKZET3Y5dKLXAG/CJQDwNmHu1pA1eS9V /oLKpT+mIusdaVNH8O88LbigdOKahbaEEOV17IFX/sCV4ypTRdNdRtvFUV/PcaAZF9L092 uffRbbe0tSqTIqZnw2rCe6DFNrZQYNpt1MEEx8DgK/gcuvgEOKhpS5+I5oqO7Ucuxyod14 2Il3jzrz3Y3CumY/N4gXx3J6Yv7dBMSqgAyD2dq5/z8KhyUipvs4ZPXb7bKPtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=a14408a53162c2e836dec5f60cb9e8949391f48f commit a14408a53162c2e836dec5f60cb9e8949391f48f Author: Wuyang Chung AuthorDate: 2022-03-08 13:52:17 +0000 Commit: Hans Petter Selasky CommitDate: 2022-03-17 12:26:14 +0000 newfs(8): Fix a bug in initialization of sblock.fs_maxbsize . Fixes: 1c85e6a35d93195e896b030d9a55f7ac4ccee2c3 (SVN r98542) Pull Request: https://github.com/freebsd/freebsd-src/pull/587 Sponsored by: NVIDIA Networking Approved by: re (gjb) (cherry picked from commit c5f549c1e0c9aa1764e87d55f183053c1545b1fc) (cherry picked from commit 4391c305e83552ed7801525723ff6c10a4efdf5e) --- sbin/newfs/mkfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index bf5ee60694d0..a6c4ee60c2d5 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -225,7 +225,7 @@ restart: if (maxbsize < bsize || !POWEROF2(maxbsize)) { sblock.fs_maxbsize = sblock.fs_bsize; printf("Extent size set to %d\n", sblock.fs_maxbsize); - } else if (sblock.fs_maxbsize > FS_MAXCONTIG * sblock.fs_bsize) { + } else if (maxbsize > FS_MAXCONTIG * sblock.fs_bsize) { sblock.fs_maxbsize = FS_MAXCONTIG * sblock.fs_bsize; printf("Extent size reduced to %d\n", sblock.fs_maxbsize); } else {