From nobody Wed Oct 26 00:44:02 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 4MxqnG1svXz4gWps; Wed, 26 Oct 2022 00:44:02 +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 4MxqnG1P1tz425V; Wed, 26 Oct 2022 00:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666745042; 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=BvbybsAuuRin5gddU0T64gHrdo0zvoZgvG79qNfrFaI=; b=e/Sl7iYMl/JE9Wk0Cq8k8Qa30QfkxghIjUrxKEaxLbQFD60EC1O3DIfwpxZKkVhoV/LHRg bYa44V1KSKoULrnyZn1oO8/YmSphq6gXgvZGUipxyYRDVPzVRjWDWmjnJxegf1dHPTku+1 F5tGDOLFwj4xa4yK+eBELshn+IfcSYj5U7mU+HKUpqBzTDL8E5fHy4JCbqGcGxxiDWbbz4 dbjbzueSVKHPhTnyep6Poft7riJJQ6Mu9e7YuzJnpXU5r6OvBJWk/qsYbPFo6R7xZhY/gt zIdswB83LFYEuDgTls9FUbsFaTD3qizSQqjDA0DM0ia+4DxjVe8mHUkwISUeOA== 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 4MxqnG0SpJzy2H; Wed, 26 Oct 2022 00:44:02 +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 29Q0i2bY029559; Wed, 26 Oct 2022 00:44:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29Q0i25O029558; Wed, 26 Oct 2022 00:44:02 GMT (envelope-from git) Date: Wed, 26 Oct 2022 00:44:02 GMT Message-Id: <202210260044.29Q0i25O029558@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: bd6dcf438e70 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: bd6dcf438e706d712647d68f0bcb469d6edda75e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666745042; 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=BvbybsAuuRin5gddU0T64gHrdo0zvoZgvG79qNfrFaI=; b=oKz7naF1G0LEoy3YDzdg+PBsrW0wm9+FLPM4kRMdRBAZxPae6ED1y/tDrtdcgvAm/Pjjco IKQfcP4LmJWTiaYUboHRQRsoSvUpaDfLuJUxo0aG1OCHRJ1AsTOhgLywp+z0yD8Oc1eVd9 +Z8kRG4C3b1yTbEGehJUzv8MVQyZXsBmrSs+u0lavpcPqO0UbGh1XbhfbnO59BUFryoYvx 71DbpwZ6cmT10HLOP5akwK0Ds2GTOxHt2FooyOyoyDskcdms2nH0qM1MVrVMTyLTuGIBLL P4yeF43k/ScOTwDmHF9SmBLny6c5JVh0iK1JfMIkV/NcLs5AMxTZuQ8fyrvUWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666745042; a=rsa-sha256; cv=none; b=Gwcmcelg0SViAU3osJ4gUuk427555uufN1A5Htqy/vsImJ04wPQ9h5ahYnZNqq0q8lxQwO bk/bR14l7hDuaNZfv8wUedZCcpxg9/sgW/KDmsbfnZgqydBZYxh+7grjAFY1w4WG8bPFVv r33im0zzyf2fKKqDXFthHQKGeSar7uYbygS4FZNiB2+IFqf2FRjXWzi7intjA5PLRzBksU osvGNEexHp+oyGfKoABLIvki462I4v40+9E3HSla76nu1b5boX4rUsztLq60ZCJMriwsIQ tgtQiZ0WCh61V8sIbktRXuKGUHpRuoX1f9WqF4eISi6TEsArUISOIUULmCD2CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bd6dcf438e706d712647d68f0bcb469d6edda75e commit bd6dcf438e706d712647d68f0bcb469d6edda75e Author: Konstantin Belousov AuthorDate: 2022-10-17 14:25:10 +0000 Commit: Konstantin Belousov CommitDate: 2022-10-26 00:43:43 +0000 tmpfs: change return type of tmpfs_pages_check_avail() to bool (cherry picked from commit 7f055843ac50a8c800f7a1b87641bec5919a46a8) --- 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 f60dc81c648c..c278261c9453 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) { @@ -1745,7 +1745,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);