aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Chagin <dchagin@FreeBSD.org>2023-04-02 08:21:15 +0000
committerDmitry Chagin <dchagin@FreeBSD.org>2023-04-02 08:21:15 +0000
commit405c0c04edb6143405426da6a5273f4c5998d594 (patch)
tree97baf6a4c75b66c4b063723df6750203b700a10c
parent7f72324346ea154a92671fc913dbe82c0287501a (diff)
downloadsrc-405c0c04edb6143405426da6a5273f4c5998d594.tar.gz
src-405c0c04edb6143405426da6a5273f4c5998d594.zip
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
-rw-r--r--sys/fs/pseudofs/pseudofs_internal.h7
-rw-r--r--sys/fs/pseudofs/pseudofs_vnops.c4
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;