From owner-p4-projects Tue May 14 8:23:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E43F737B409; Tue, 14 May 2002 08:23:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2F88537B401 for ; Tue, 14 May 2002 08:23:40 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4EFNei85420 for perforce@freebsd.org; Tue, 14 May 2002 08:23:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 14 May 2002 08:23:40 -0700 (PDT) Message-Id: <200205141523.g4EFNei85420@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11321 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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