From nobody Fri Mar 01 04:12:33 2024 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 4TmF6n25XBz5BnZf; Fri, 1 Mar 2024 04:12:33 +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 4TmF6n1bXtz4V9V; Fri, 1 Mar 2024 04:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709266353; 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=Z9Dxar9HL+1eZ3D6X9Sc2/b7ei8mpyk+q+K4JwWpNVg=; b=XMBfduJTMaYVqhHkkYgMXo0j5q1t8myWvub6jFpKZT2kb1MWZ93PSAFzmuqd+hHMysAYGL 2I1yWgWyZYkhBohBCuivmASOG4x9fNKZMrh2YJgzAdHBnGprag4Boa/kGFDDL2O6gd6i0r NX7h9R7GLIivbS100Nx7ZQ4htYeXpf7fL9ofmuenATWjG1KUFgpBR7KwYSg5ICLuF6NbZl gLnZJcG9Iywv2LFgiYovQBcISnMrZY08kmk6spF5LgDAHnxDzimc3Zg8HqyaKZoAeOY8d4 D+k0OTuHUzyoEYrj7Nfhb3YEPLZ4Ggd+XuBc8+gd7T8Xqsnh9daNW5WM3sQQOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709266353; a=rsa-sha256; cv=none; b=usspPG+MnoE+MO7NsD4XAy8ESqpuBW2e4FuobGTEIiH3jk9qlmIjj5LVgeYLTnCyJGy1W6 XMxvuJbsjtwcz11cpBq+UsB6aX7COhkJhJniaIvaBK90zA3B13BKdsoMF6CFRc5VQ6DCwh 00aPaPOSVePwqEv6f4vdelRnVisMAuz5ahka59hKPKcU9ur/hA5qe0aIjexbMJd2ZLZL/Y 1BqsZ5byEY2nNLHJ8IzphskU0NEicjeYsrCN9azoSA9K4Jmq9qewl8SFX94if63VdAWRCD gG/RaMEVxHoKglA5xuOq2bMT0TLh48/JFhPFjaUH1ztdccEg0eR6K07LhKNVmQ== 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=1709266353; 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=Z9Dxar9HL+1eZ3D6X9Sc2/b7ei8mpyk+q+K4JwWpNVg=; b=ajMDLXUbJFFVnSZ2waW+qNkplCG/UpP1ACSdxXiy4MNwoGlk99FuRRYL9BfilrUbzr6o8e /LNerC+Rmi/24H4p2mk/p9ZDq1bGB6D4OdPl98jkYBnhPHD26wMmzXv+YfAtYlY/MuTr4Z alN9Ra0GKEFwf+p/OGMk6vOhIDpPehsjYlXH46akQIIUDF3WGOiy7/+bCEhza6/rB2GPnl cEZgG49stxL1+Rvn/8UWs5SklqUVmjQ6VTw95UvuXTnYCtgHBse4+9grCOFC5dlcuLoKMd MHKbIbUyGEd0ZotWQfWiivWYhoCOl48IRXR6fmz/INyyp3lLX8CidBW+hnx7VQ== 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 4TmF6n1C2nz19SQ; Fri, 1 Mar 2024 04:12:33 +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 4214CXpN026276; Fri, 1 Mar 2024 04:12:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4214CXE5026273; Fri, 1 Mar 2024 04:12:33 GMT (envelope-from git) Date: Fri, 1 Mar 2024 04:12:33 GMT Message-Id: <202403010412.4214CXE5026273@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: b2c9d403d5a6 - stable/14 - fs/msdosfs fatblock: use ulmin() rather than min() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b2c9d403d5a6d4a8eaaeff0005e48c6d107dba31 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b2c9d403d5a6d4a8eaaeff0005e48c6d107dba31 commit b2c9d403d5a6d4a8eaaeff0005e48c6d107dba31 Author: Konstantin Belousov AuthorDate: 2024-02-23 17:30:10 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-01 04:12:02 +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;