svn commit: r329449 - head/sys/kern

[Mateusz Guzik]

Author: mjg
Date: Sat Feb 17 09:03:11 2018
New Revision: 329449
URL: https://svnweb.freebsd.org/changeset/base/329449

Log:
  exit: stop doing PROC_SLOCK just to call proc_reap
  
  It immediately does PROC_SUNLOCK anyway and the lock plays no role.

Modified:
  head/sys/kern/kern_exit.c

Modified: head/sys/kern/kern_exit.c
==============================================================================
--- head/sys/kern/kern_exit.c	Sat Feb 17 08:48:45 2018	(r329448)
+++ head/sys/kern/kern_exit.c	Sat Feb 17 09:03:11 2018	(r329449)
@@ -817,12 +817,10 @@ proc_reap(struct thread *td, struct proc *p, int *stat
 
 	sx_assert(&proctree_lock, SA_XLOCKED);
 	PROC_LOCK_ASSERT(p, MA_OWNED);
-	PROC_SLOCK_ASSERT(p, MA_OWNED);
 	KASSERT(p->p_state == PRS_ZOMBIE, ("proc_reap: !PRS_ZOMBIE"));
 
 	q = td->td_proc;
 
-	PROC_SUNLOCK(p);
 	if (status)
 		*status = KW_EXITCODE(p->p_xexit, p->p_xsig);
 	if (options & WNOWAIT) {
@@ -1090,7 +1088,6 @@ proc_to_reap(struct thread *td, struct proc *p, idtype
 	}
 
 	if (p->p_state == PRS_ZOMBIE && !check_only) {
-		PROC_SLOCK(p);
 		proc_reap(td, p, status, options);
 		return (-1);
 	}