From nobody Fri Mar 01 04:13:14 2024 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 4TmF7Z6t4kz5Bnh3; Fri, 1 Mar 2024 04:13: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 4TmF7Z64qTz4WmY; Fri, 1 Mar 2024 04:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709266394; 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=If2Kwj4yBKRMchXJdrZ8tAOz5prkXuAIduGH2+Slj0A=; b=IAncZY8SBxKL8LtWKbGpfvN4gC+UOBqAd+fKb0aimd/YVD4PB8I1/hfjtxUSY2Eja7v4vk 1o3/hVlZPFu0Pe+5HpK9sZrbiSCc+HsHo/IvImDIMqjNRxX4f0hwHHVrvj0FafyK+iIPDY BOp8cZCgGawZL7GWfNWGwBdM9wUDtpn2Sn7e0sUXcjKkAtrcYpqRch6/ODXmROFjUClKUn +FjlMlLRNZ2mQvr/hblaNJkwM3nKY5Nm9SIJGYnPkTYzd128H3ffDK+j1Se5c8Ap+ZcEF4 kUzDwG9r7vXFp+R0Xo/pu1rl3iQj/p6u/vVKat9fxYwHb6auwxCvPodjkVDsPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709266394; a=rsa-sha256; cv=none; b=ihFZMWILhsGj7VHR4ULw9kgVbEk0XcQo36juAyA6MWNBEDK+g/OaDzizX/YaG7HjebUdvF BHHMZHYbQSv827LIGxfU708rNpzUY4vFOBjOlSLG6vmgtrdvnl0Buw85oEfhaW1SrvWdg4 QHojLABmZigW7CyxvO+ZKXl9swI9tA3Xl45LvvplYcXWBr4G9DD1/PsfhMyejGDkyeBApf f2X7wISdolT2g+PzteUm1QXDVe5aqlR/zZnk8TlHGaqC7oDEpUnBbk/I15PEFz/neYIcnP aEIH2MDkJPWI6SxXsCzeJ4RT/S1rVWDC1wHzPC7PCNYscbEBjAQ68SSvbZa/dg== 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=1709266394; 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=If2Kwj4yBKRMchXJdrZ8tAOz5prkXuAIduGH2+Slj0A=; b=XJF6EUFvOCsjTeXejCeV0ErHA7nxUY7n2VzZJjhAlhWJ6Yt73Gud0et3/PJ60dbqd/vgvw mt43fXDMwq/9A0miIxP4sD3K7ML61RQZR7rVRR/BNDs0oZwwUbU6ustvxWwmWd/NqUaH8v 5oqiQ8y1Pj/mPcchVKF/IbHhRBwjPg0w3t7X41VK3sm7NrCzw3+eGpplKcwWwb1BRWgZFG 3WfgkYDcwn8exuQZRPafZsUjFkv0Mwku1/Mre0Pfh2M78J7Pg+C63GWMCHCNBH7md/OLu2 Mz+opXauOSMUF1YpVWpp1UHHkLLmwPoL20IimH19L64qS9wE+T6MyviBCB+DmA== 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 4TmF7Z5hJcz19P1; Fri, 1 Mar 2024 04:13:14 +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 4214DEkR026620; Fri, 1 Mar 2024 04:13:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4214DExp026617; Fri, 1 Mar 2024 04:13:14 GMT (envelope-from git) Date: Fri, 1 Mar 2024 04:13:14 GMT Message-Id: <202403010413.4214DExp026617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 846bf43ca4a2 - stable/13 - fs/msdosfs fatblock: use ulmin() rather than min() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 846bf43ca4a2b42f2751df935de6d3257c6169ae Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=846bf43ca4a2b42f2751df935de6d3257c6169ae commit 846bf43ca4a2b42f2751df935de6d3257c6169ae Author: Konstantin Belousov AuthorDate: 2024-02-23 17:30:10 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-01 04:12:45 +0000 fs/msdosfs fatblock: use ulmin() rather than min() PR: 277237 (cherry picked from commit 0085afdceb17cb7d4e41f9073299f688372c6a0f) --- sys/fs/msdosfs/msdosfs_fat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c index 4a7faa9e1f05..bfaff417f677 100644 --- a/sys/fs/msdosfs/msdosfs_fat.c +++ b/sys/fs/msdosfs/msdosfs_fat.c @@ -97,7 +97,7 @@ fatblock(struct msdosfsmount *pmp, u_long ofs, u_long *bnp, u_long *sizep, fatblocksec /= 2; } bn = ofs / pmp->pm_fatblocksize * pmp->pm_fatblocksec; - size = roundup(min(fatblocksec, pmp->pm_FATsecs - bn) * DEV_BSIZE, + size = roundup(ulmin(fatblocksec, pmp->pm_FATsecs - bn) * DEV_BSIZE, pmp->pm_BlkPerSec * DEV_BSIZE); bn += pmp->pm_fatblk + pmp->pm_curfat * pmp->pm_FATsecs;