From nobody Wed Oct 19 17:24:17 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 4MsyJf25p8z4gSxR; Wed, 19 Oct 2022 17:24:18 +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 4MsyJf1b74z3hS3; Wed, 19 Oct 2022 17:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666200258; 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=FdYnR4VmtfIcr4m9R9ua9F20Ij8jLk63N2fkcR8Oiow=; b=qM14jZCP9hdY6P+HaiQO3JVXwYCkPzx0bOXdTUdvdX6gzoCUImZTV55Tsap0vi32pbuOZ2 Su6ic/5/GXFNcQFE8NjTqhGMbCYNe+eN7Dwh4eI/ehePhCmyu3exhkm8vEv7/JO7jMIV6b bcn6fp8t0BPv0+rS1SsYCvdOGpuh7+2br7Nfwd1X6mdXuwuBOXpshFxaU4/lcRR6g2Tj5H lXTHN8PWYNtqsMhmsQKB8KIT1cWVpz6VGrJh6VKZgiCAahYhBTXLv1wfUOJ2e1CrIaHEWp m0EkL5li6a7PTLsOiMI1nuYumm+2rCWnEh0iUksiab1xADfer/b6GjJbxq0Dqw== 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 4MsyJf0Hkszbqf; Wed, 19 Oct 2022 17:24:18 +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 29JHOHGa073772; Wed, 19 Oct 2022 17:24:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29JHOHUY073771; Wed, 19 Oct 2022 17:24:17 GMT (envelope-from git) Date: Wed, 19 Oct 2022 17:24:17 GMT Message-Id: <202210191724.29JHOHUY073771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7f055843ac50 - main - tmpfs: change return type of tmpfs_pages_check_avail() to bool 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/main X-Git-Reftype: branch X-Git-Commit: 7f055843ac50a8c800f7a1b87641bec5919a46a8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666200258; 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=FdYnR4VmtfIcr4m9R9ua9F20Ij8jLk63N2fkcR8Oiow=; b=SXPb28e7jv23HrW7DDVXe6r8oOfMr1CxsrUCUuysQhRRZRmor9Lq+auqqwjjv8F6+IprNn QH1NqO4msi0u/mIFsQNZZS2yoI+iM+gqeNnX9DTTIryccFjYfX9kUWQiNUXIbOtcqOHMHz z1dS7Z/ObGe69J2NNmAQGOMEl/BDP6zZH6/n60P10G0uETB1qzsiBm4Mmc1w5ioVDsupmj PX3kt9oPFfJgnloCYbF25f35HcIzidaFkSxj5yv79kQaDdmNHzUsdJ5xJknRyHvKCnJItm P1P6/j8HLJ9pQgnaTtDuXrA+b8HnFSeKOrXbI8VILbxEJBu9mWf7qdXCVcNc9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666200258; a=rsa-sha256; cv=none; b=CMTkPhkO4CbstUg+OTOwUGHTSmJYKwmV5EE6JhDo6jZ77ar4HOFFzLh3ZoNdTUQU0Rz3fE riB8MkSFN3Tg1GL1jRSyd5nDsvwIEorSjJMCWYeKxXbd7dYr5d9Nighm8rxuMQ9X7cRbfd WRfacgG5thZcWd4HLcFsaeqQ2FJoFpJMYWn6PaUwJ74whlhPg0duLoeBs9ux2C719HwQtc TBcwRxR07JNUc1saUNCORmcefsI9SwIj44YjRNmRI1iGrME/oR9VY+5lNyhIb1krbZcfvC 1TegCcmmGVD6/XDK2Sc7dIgWzCIPsBY1X8Pk9CouTEjSg2hp2xBR5Wq0wgLH3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7f055843ac50a8c800f7a1b87641bec5919a46a8 commit 7f055843ac50a8c800f7a1b87641bec5919a46a8 Author: Konstantin Belousov AuthorDate: 2022-10-17 14:25:10 +0000 Commit: Konstantin Belousov CommitDate: 2022-10-19 17:24:07 +0000 tmpfs: change return type of tmpfs_pages_check_avail() to bool Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37024 --- sys/fs/tmpfs/tmpfs_subr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index 7d589b1c193d..adf31132f82c 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -350,17 +350,17 @@ tmpfs_pages_used(struct tmpfs_mount *tmp) return (meta_pages + tmp->tm_pages_used); } -static size_t +static bool tmpfs_pages_check_avail(struct tmpfs_mount *tmp, size_t req_pages) { if (tmpfs_mem_avail() < req_pages) - return (0); + return (false); if (tmp->tm_pages_max != ULONG_MAX && tmp->tm_pages_max < req_pages + tmpfs_pages_used(tmp)) - return (0); + return (false); - return (1); + return (true); } static int @@ -468,7 +468,7 @@ tmpfs_alloc_node(struct mount *mp, struct tmpfs_mount *tmp, enum vtype type, if (tmp->tm_nodes_inuse >= tmp->tm_nodes_max) return (ENOSPC); - if (tmpfs_pages_check_avail(tmp, 1) == 0) + if (!tmpfs_pages_check_avail(tmp, 1)) return (ENOSPC); if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) { @@ -1737,7 +1737,7 @@ tmpfs_reg_resize(struct vnode *vp, off_t newsize, boolean_t ignerr) } if (newpages > oldpages && - tmpfs_pages_check_avail(tmp, newpages - oldpages) == 0) + !tmpfs_pages_check_avail(tmp, newpages - oldpages)) return (ENOSPC); VM_OBJECT_WLOCK(uobj);