svn commit: r243007 - head/sys/kern

[Mateusz Guzik]

Author: mjg
Date: Tue Nov 13 22:01:25 2012
New Revision: 243007
URL: http://svnweb.freebsd.org/changeset/base/243007

Log:
  enterpgrp: get rid of pgrp2 variable and use KASSERT directly on pgfind result.
  
  pgrp2 was used only for debugging, but pgrp2 = pgfind(..) was present in compiled code even for kernels without INVARIANTS
  
  Approved by:	trasz (mentor)
  MFC after:	1 week

Modified:
  head/sys/kern/kern_proc.c

Modified: head/sys/kern/kern_proc.c
==============================================================================
--- head/sys/kern/kern_proc.c	Tue Nov 13 21:20:30 2012	(r243006)
+++ head/sys/kern/kern_proc.c	Tue Nov 13 22:01:25 2012	(r243007)
@@ -421,17 +421,13 @@ enterpgrp(p, pgid, pgrp, sess)
 	struct pgrp *pgrp;
 	struct session *sess;
 {
-	struct pgrp *pgrp2;
 
 	sx_assert(&proctree_lock, SX_XLOCKED);
 
 	KASSERT(pgrp != NULL, ("enterpgrp: pgrp == NULL"));
 	KASSERT(p->p_pid == pgid,
 	    ("enterpgrp: new pgrp and pid != pgid"));
-
-	pgrp2 = pgfind(pgid);
-
-	KASSERT(pgrp2 == NULL,
+	KASSERT(pgfind(pgid) == NULL,
 	    ("enterpgrp: pgrp with pgid exists"));
 	KASSERT(!SESS_LEADER(p),
 	    ("enterpgrp: session leader attempted setpgrp"));