From nobody Sun Apr 2 08:24:28 2023 X-Original-To: dev-commits-src-main@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 4Pq6Wd284Sz43Dyv; Sun, 2 Apr 2023 08:24:29 +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 4Pq6Wd1cr1z47RB; Sun, 2 Apr 2023 08:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680423869; 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=RCiakM9HFDog9Iv2/JmfunxjvcMCsgj+Lrv4BfFJor8=; b=KgGGwFVOseF/p2vPBLCd99yAC7USrA8FobFQZ1CiE/sghwHQTYKGmBytVCb0P+s7cENKei ksgZ4sVnyZ80EKHd5OVDWesn7vdYbcyANTsNQLDoJT8/4OHnaF7FKjQXAf+O/eTmad8Bm9 /T/2Y9xWu+LLqeGyvpXUGlCOuwouqQ7f+SXA673khca9JXRBfLc6R1ehPTx8//TrMzJU5n ssUn4JacZsXWrjeSehoz2F31inm8TJLNfE/LaYdwmwb06LyHryr6/zNgx4ValApxJiwkDb YQRyER2FovUJZgbaVcja2s6jUY8KZ9vNEc7Eon8pG5DShADozKagY8YtdKVw8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680423869; 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=RCiakM9HFDog9Iv2/JmfunxjvcMCsgj+Lrv4BfFJor8=; b=onTdpcKSShlcrUAyNJKSYQh0BCMC5+WxCpY8XA8lsG5oxfOU+G/s5WwXRF5Nh/HeJJtrii GwrJuGxJA+F2o2cm2nfz6iGwAfIlcbF9lmajei11O34TzKExZv1yY2mhu63Z/52X+8OixF NtQT8DLbeDeyuBdiuL4mXxCy7tXVXAflmyxSx08jwNg3IEMjBCrmPYK7f/GgYwlPvmiveV ZBSUXGeotOudaz2yfs/CaJGhpzYjlFFaOxy9985DNIeEx8xlWYO96Qk5ou9pe6dGBwaeDQ TePxmhSUgLjO6KSulnQPIlO2R40NiB9+tANTFsmGujFCOGPyGEj9Pk1TQJqqFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680423869; a=rsa-sha256; cv=none; b=ezPDmIO/vo9frMj0R3UZL7ZYIr2zUOz0Owu7RjbT5TyBR6KZEuZrUUz8alhuxSIDAJpbU6 d/TQPepQiFRFYbjuPONYoIoe0BspGMC5PsHIDuGxaBDchtFgtd4IdN3TzpOIpuolLYqYIT bwJGdnLniUBbg8FyUuN84L14aGa9mGo1E9erP7odU09tk1l6W2G2wWCAuwf9jqTfRUSiFP Sm4/XxVBtlcnGko80JftO7pcshz+KfWuQLMf6jLih11SffltGYZStGynEyX2d4uiwB6TkO reaG8yEjrJoQRckC/YVLjXK3Fi9x/UFO9sR94rplo4F2qL0L+RimS+3RqtrVFA== 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 4Pq6Wd0f38z18rM; Sun, 2 Apr 2023 08:24:29 +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 3328OSSc076348; Sun, 2 Apr 2023 08:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3328OSLH076347; Sun, 2 Apr 2023 08:24:28 GMT (envelope-from git) Date: Sun, 2 Apr 2023 08:24:28 GMT Message-Id: <202304020824.3328OSLH076347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 405c0c04edb6 - main - pseudofs: Allow vis callback to be called for a named node List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 405c0c04edb6143405426da6a5273f4c5998d594 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=405c0c04edb6143405426da6a5273f4c5998d594 commit 405c0c04edb6143405426da6a5273f4c5998d594 Author: Dmitry Chagin AuthorDate: 2023-04-02 08:21:15 +0000 Commit: Dmitry Chagin CommitDate: 2023-04-02 08:21:15 +0000 pseudofs: Allow vis callback to be called for a named node This will be used later in the linsysfs module to filter out VNETs. Reviewed by: des Differential revision: https://reviews.freebsd.org/D39382 MFC after: 1 month --- sys/fs/pseudofs/pseudofs_internal.h | 7 ++++--- sys/fs/pseudofs/pseudofs_vnops.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/fs/pseudofs/pseudofs_internal.h b/sys/fs/pseudofs/pseudofs_internal.h index 2cc8f32b1d01..85df317d30cc 100644 --- a/sys/fs/pseudofs/pseudofs_internal.h +++ b/sys/fs/pseudofs/pseudofs_internal.h @@ -156,9 +156,10 @@ pn_vis(PFS_VIS_ARGS) { PFS_TRACE(("%s", pn->pn_name)); - KASSERT(pn->pn_vis != NULL, ("%s(): no callback", __func__)); - KASSERT(p != NULL, ("%s(): no process", __func__)); - PROC_LOCK_ASSERT(p, MA_OWNED); + if (pn->pn_vis == NULL) + return (1); + if (p != NULL) + PROC_LOCK_ASSERT(p, MA_OWNED); pfs_assert_not_owned(pn); return ((pn->pn_vis)(PFS_VIS_ARGNAMES)); } diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index f4e27b469213..96c59d7c023d 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -119,7 +119,7 @@ pfs_visible(struct thread *td, struct pfs_node *pn, pid_t pid, if (p) *p = NULL; if (pid == NO_PID) - PFS_RETURN (1); + PFS_RETURN (pn_vis(td, NULL, pn)); proc = pfind(pid); if (proc == NULL) PFS_RETURN (0); @@ -826,7 +826,7 @@ pfs_iterate(struct thread *td, struct proc *proc, struct pfs_node *pd, } else if (proc != NULL) { visible = pfs_visible_proc(td, *pn, proc); } else { - visible = 1; + visible = pn_vis(td, NULL, *pn); } if (!visible) goto again;