D51462.1783231889.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51462.1783231889.diff
View Options

	diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c
	--- a/sys/fs/pseudofs/pseudofs_vnops.c
	+++ b/sys/fs/pseudofs/pseudofs_vnops.c
	@@ -850,7 +850,7 @@
	struct uio *uio;
	struct pfsentry pfsent, pfsent2;
	struct pfsdirentlist lst;
	- off_t offset;
	+ off_t coffset, offset;
	int error, i, resid;

	STAILQ_INIT(&lst);
	@@ -860,6 +860,9 @@
	PFS_TRACE(("%s pid %lu", pd->pn_name, (unsigned long)pid));
	pfs_assert_not_owned(pd);

	+ if (va->a_eofflag != NULL)
	+ *va->a_eofflag = 0;
	+
	if (vn->v_type != VDIR)
	PFS_RETURN (ENOTDIR);
	KASSERT_PN_IS_DIR(pd);
	@@ -878,6 +881,10 @@
	if (pid != NO_PID && !pfs_lookup_proc(pid, &proc))
	PFS_RETURN (ENOENT);

	+ /*
	+ * The allproc lock is required in pfs_iterate() for procdir
	+ * directories.
	+ */
	sx_slock(&allproc_lock);
	pfs_lock(pd);

	@@ -897,23 +904,15 @@
	}
	}

	- /* skip unwanted entries */
	- for (pn = NULL, p = NULL; offset > 0; offset -= PFS_DELEN) {
	+ for (pn = NULL, p = NULL, coffset = 0; resid >= PFS_DELEN;
	+ coffset += PFS_DELEN) {
	if (pfs_iterate(curthread, proc, pd, &pn, &p) == -1) {
	- /* nothing left... */
	- if (proc != NULL) {
	- _PRELE(proc);
	- PROC_UNLOCK(proc);
	- }
	- pfs_unlock(pd);
	- sx_sunlock(&allproc_lock);
	- PFS_RETURN (0);
	+ if (va->a_eofflag != NULL)
	+ *va->a_eofflag = 1;
	+ break;
	}
	- }
	-
	- /* fill in entries */
	- while (pfs_iterate(curthread, proc, pd, &pn, &p) != -1 &&
	- resid >= PFS_DELEN) {
	+ if (coffset < offset)
	+ continue;
	if ((pfsent = malloc(sizeof(struct pfsentry), M_IOV,
	M_NOWAIT \| M_ZERO)) == NULL) {
	error = ENOMEM;