Author: kib
Date: Thu Aug 27 09:06:14 2015
New Revision: 287199
URL: https://svnweb.freebsd.org/changeset/base/287199
Log:
MFC r286975:
Remove the wrong asserts.
Modified:
stable/10/lib/libc/sys/procctl.2
stable/10/sys/kern/kern_procctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libc/sys/procctl.2
==============================================================================
--- stable/10/lib/libc/sys/procctl.2 Thu Aug 27 08:58:03 2015
(r287198)
+++ stable/10/lib/libc/sys/procctl.2 Thu Aug 27 09:06:14 2015
(r287199)
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 29, 2014
+.Dd August 21, 2015
.Dt PROCCTL 2
.Os
.Sh NAME
@@ -148,7 +148,11 @@ The specified process is the root of the
.El
The
.Fa rs_children
-field returns the number of children of the reaper.
+field returns the number of children of the reaper among the descendands.
+It is possible to have a child which reaper is not the specified process,
+since the reaper for the existing children is not reset on the
+.Dv PROC_REAP_ACQUIRE
+operation.
The
.Fa rs_descendants
field returns the total number of descendants of the reaper(s),
Modified: stable/10/sys/kern/kern_procctl.c
==============================================================================
--- stable/10/sys/kern/kern_procctl.c Thu Aug 27 08:58:03 2015
(r287198)
+++ stable/10/sys/kern/kern_procctl.c Thu Aug 27 09:06:14 2015
(r287199)
@@ -187,8 +187,6 @@ reap_status(struct thread *td, struct pr
}
} else {
rs->rs_pid = -1;
- KASSERT(LIST_EMPTY(&reap->p_reaplist), ("reap children list"));
- KASSERT(LIST_EMPTY(&reap->p_children), ("children list"));
}
return (0);
}
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
