From nobody Thu Mar 17 10:00:16 2022 X-Original-To: dev-commits-src-branches@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 810631A17A31; Thu, 17 Mar 2022 10:00:16 +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 4KK2h02by3z4StQ; Thu, 17 Mar 2022 10:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647511216; 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=kGH+ym/dkptv4OK72QYFzvM3nlbuxRYw511WA/Q4SiE=; b=oPLg99VnRTXyfuDO62gHuHCu4y+0WiHO1MWKIaOmKOQg0WLYBrugbngUjESZ0fWK/GY/O2 Uu5haZCax0ZAJ9m5jl4vRxnDGieYtHvwDkqI8MrrZN/aZW49hl5MoxkZW7Qpxgiows4qms wTbbrJ1BKmG3aLCZtCavcR6VKCJeMDiFoQjAL4P0GTGt4RBeSqM5oYrk7+MC+6siLSfsOa PzTpFF+uonKgVJUqJObVH3x5eJajrivePpZrKr1Px1LHRs04j3HGZOP6THeUOMYDuC4VRu lhPrrB/dmDesjNHE9jmmezHlf2FEoA579fvcW+j03E6UG88jLHMVqPknRb1tJg== 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 2E2DD474; Thu, 17 Mar 2022 10:00:16 +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 22HA0GEt087722; Thu, 17 Mar 2022 10:00:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HA0GIw087716; Thu, 17 Mar 2022 10:00:16 GMT (envelope-from git) Date: Thu, 17 Mar 2022 10:00:16 GMT Message-Id: <202203171000.22HA0GIw087716@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: 4391c305e835 - stable/13 - newfs(8): Fix a bug in initialization of sblock.fs_maxbsize . List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4391c305e83552ed7801525723ff6c10a4efdf5e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647511216; 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=kGH+ym/dkptv4OK72QYFzvM3nlbuxRYw511WA/Q4SiE=; b=TcUuaN1cxw9j+36eJOwS/IhQpusA3SuycmOA6sHLjVj3b+Wqzaz3WkfkZAggiBKTCc7gd9 dgbOyi2kQbyDkiQhyHFxHQRqZp2gYfGVuCvrJb6fYkAsFmH6HWH8EoVk8jsSkn5xNXz/xc 8N/0aL6cTGtWR3KETgv7y4/vrMXdQSf2Jgc0dvw8Pq/jzFsx1gjs6JMOL7aS+0YUkvxHHj O9DN0CCXdVHJYf5YPayad52c1lCGM4ob2dMeG3Zl5/jc2qopCSZjkRHghQ8+jaTzViid/r 7fcE7l1Ht62hWkuMozmdWZqDM98HcVllsXGixoQmpUT8jWpZKe7XC9ukVlNgeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647511216; a=rsa-sha256; cv=none; b=o2YwlDbkl4fsPgICHM++FcN1m8PYWMKGhKioYXMP9M5MEKuibKf3lou/pPFYmwvQbHQpmt Qq7sP5a3ejdgakSf0kjwwhQS59gYvQ1u7rqDxvqRqjG73NwvMiVZqfo9hDLnKo9+1PDmAA e+CJuephKlUxWGkwpiQUBNYyfYEDgM/3e3elimTdErUSyPOyn5/LiQiBCxmlMziq14zkPM 55+2DXnmKVOASBhyIM2BA+hz2OWRnRIXDvBU7u8pfkAKkcJWc74bjRylWHJtHk3c+AMbGo 4VxU4reubjftUq9xla/KyiovHtpJhh3FMUH+v2xuMGSPP1IsGRK0sUTIGvd4Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=4391c305e83552ed7801525723ff6c10a4efdf5e commit 4391c305e83552ed7801525723ff6c10a4efdf5e Author: Wuyang Chung AuthorDate: 2022-03-08 13:52:17 +0000 Commit: Hans Petter Selasky CommitDate: 2022-03-17 09:54:57 +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 (cherry picked from commit c5f549c1e0c9aa1764e87d55f183053c1545b1fc) --- 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 {