Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 May 2002 08:23:40 -0700 (PDT)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 11321 for review
Message-ID:  <200205141523.g4EFNei85420@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11321

Change 11321 by rwatson@rwatson_curry on 2002/05/14 08:22:54

	Fix mis-merge: code that moved in the main tree to another
	location wasn't removed from the old location in our tree.

Affected files ...

... //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#11 (text+ko) ====

@@ -556,18 +556,6 @@
 		VREF(p2->p_textvp);
 	if (p2->p_textdvp)
 		VREF(p2->p_textdvp);
-
-	if (flags & RFCFDG)
-		fd = fdinit(td);
-	else if (flags & RFFDG) {
-		FILEDESC_LOCK(p1->p_fd);
-		fd = fdcopy(td);
-		FILEDESC_UNLOCK(p1->p_fd);
-	} else
-		fd = fdshare(p1);
-	sx_xlock(&proctree_lock);
-	PGRP_LOCK(p1->p_pgrp);
-	PROC_LOCK(p2);
 	p2->p_fd = fd;
 	PROC_UNLOCK(p1);
 	PROC_UNLOCK(p2);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205141523.g4EFNei85420>