From nobody Thu Jun 29 08:19:59 2023 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 4QsBFr0m4mz4knQn; Thu, 29 Jun 2023 08:20:00 +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 4QsBFq5Xh3z3sfY; Thu, 29 Jun 2023 08:19:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026799; 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=UuCvCVnvkPoFyG7yvPWqk771eCXXxBDghd3gQHZxggI=; b=TjPQhrREoa+8kOdzcme8vzcfg3Ws7eMHEIIwgs1XQgFpx2pRIQHsXzp4VZkz0HC8q/HxJm +KjKmTHe4QKWyq1mCKq2QGhgIl5C0q5Lrw0EAL3gD3ytvZ7N7DxDDt7eHSF2E9hXjHQKEN hBtTr8OGIWeV9l/lHnnLqCa2EWjjFJtMqoIpD1Fg/SMYV9COlFOraRkW8ocWX+mIdU6dT6 SQcI2UNoc37K1U8fWSZCwu7kPVl0c7LZ9UYWwx1v0Di6TRqePwRbUAi154ct5x7OwYeuhb IIsivWbYylPvoDo2/BV3LTpM0i10ygVmWXe28cwcsOHezMxoS9BgYXz+U8HL/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026799; 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=UuCvCVnvkPoFyG7yvPWqk771eCXXxBDghd3gQHZxggI=; b=hM1SYNDeMQazHhCofyhWkbytS6LmR4Y9thgknWF1HOM1vwUGQARhvsrVQ97fDpqlp23UcS +mFkE3Mo28oyvk2r//M3xJO5r2HmZBZpagSaCy7/szYNkjWg8MS9MiA6UkRU9shzmCPex9 5qJY6dpWSXmA8X/yRzGRytiFPUvEGIF3IVhkeo+JvEH7SxQ/20wpBZkHeaPKWAmVOd+91G pFGRmiRIkBPPYULzahomJYy6azjTDY8vN9bCKU7Oo8zbuQmYLTa/FPKj35ozHDAG3vXOeW yhBfPYZE3zMk7yXRsjKV3cujzp3itBR/IiZqOots7F/nbteSuoAvc2iiieNvgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026799; a=rsa-sha256; cv=none; b=dMhAGcR58f0dbgrQLM7ibfqJpMOsPhFBbaeIMBcol5bsJv/1pXcOL2LM+ZDG4Dbv/HmhM+ I1mdsgtGo6XRB9Ka4nLhitD3+ThwXrKyZH4rEAGrH2dCOF5zmkD/K/vjlBcHB1BhinxvCw r1cdbpDp7QjGf8aU5taDijuexRX9aGlx5xnfKRx9YOBqR9LjcfgQAqgdxWN4GzZ329n0XM mQO789e2wfkRJ07ziXSBxhPEZ/WH7T+BKxM0/CKk4x3Qzj5fLF4JVW3W2YATSCYXJ2FxVD SI9C+waVyyNAKpPHCk9mEUxrNg38rqiXPPTlJwuoKQGD9n6FrT62wvAqchaS3g== 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 4QsBFq4cMhz17sN; Thu, 29 Jun 2023 08:19:59 +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 35T8JxFh074511; Thu, 29 Jun 2023 08:19:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8JxD9074510; Thu, 29 Jun 2023 08:19:59 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:19:59 GMT Message-Id: <202306290819.35T8JxD9074510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: c38bb48b04c9 - stable/13 - pseudofs: Allow vis callback to be called for a named node 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c38bb48b04c9bb24e549eee6a099d9f9362b1ae8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=c38bb48b04c9bb24e549eee6a099d9f9362b1ae8 commit c38bb48b04c9bb24e549eee6a099d9f9362b1ae8 Author: Dmitry Chagin AuthorDate: 2023-04-02 08:21:15 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:15:17 +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 (cherry picked from commit 405c0c04edb6143405426da6a5273f4c5998d594) --- 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 29bb1544e7ad..f58b1f8bdc47 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;