svn commit: r243583 - stable/8/sys/kern

Mateusz Guzik mjg at FreeBSD.org
Tue Nov 27 01:30:13 UTC 2012


Author: mjg
Date: Tue Nov 27 01:30:12 2012
New Revision: 243583
URL: http://svnweb.freebsd.org/changeset/base/243583

Log:
  MFC r243007:
  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

Modified:
  stable/8/sys/kern/kern_proc.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/kern/   (props changed)

Modified: stable/8/sys/kern/kern_proc.c
==============================================================================
--- stable/8/sys/kern/kern_proc.c	Tue Nov 27 01:28:35 2012	(r243582)
+++ stable/8/sys/kern/kern_proc.c	Tue Nov 27 01:30:12 2012	(r243583)
@@ -414,17 +414,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"));


More information about the svn-src-stable-8 mailing list