From owner-p4-projects@FreeBSD.ORG  Mon Jul 23 17:09:53 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EE41116A420; Mon, 23 Jul 2007 17:09:52 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BFC9A16A417
	for <perforce@FreeBSD.org>; Mon, 23 Jul 2007 17:09:52 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B878713C442
	for <perforce@FreeBSD.org>; Mon, 23 Jul 2007 17:09:52 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6NH9qaA095382
	for <perforce@FreeBSD.org>; Mon, 23 Jul 2007 17:09:52 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6NH9q43095379
	for perforce@freebsd.org; Mon, 23 Jul 2007 17:09:52 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Mon, 23 Jul 2007 17:09:52 GMT
Message-Id: <200707231709.l6NH9q43095379@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 123977 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Jul 2007 17:09:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=123977

Change 123977 by rdivacky@rdivacky_witten on 2007/07/23 17:08:52

	Fix kern_linkat() nd* merge.

Affected files ...

.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_kse.c#4 edit
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#51 edit

Differences ...

==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_kse.c#4 (text+ko) ====

@@ -67,8 +67,6 @@
 static void thread_alloc_spare(struct thread *td);
 static struct thread *thread_schedule_upcall(struct thread *td, struct kse_upcall *ku);
 static struct kse_upcall *upcall_alloc(void);
-static void upcall_free(struct kse_upcall *ku);
-
 
 struct mtx kse_lock;
 MTX_SYSINIT(kse_lock, &kse_lock, "kse lock", MTX_SPIN);
@@ -83,13 +81,6 @@
 }
 
 void
-upcall_free(struct kse_upcall *ku)
-{
-
-	uma_zfree(upcall_zone, ku);
-}
-
-void
 upcall_remove(struct thread *td)
 {
 

==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#51 (text+ko) ====

@@ -1637,9 +1637,6 @@
 		return (error);
 	}
 
-	NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT |
-	    SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, ldvp);
-
 	if ((error = namei(&nd)) != 0)
 		goto out;
 	vfslocked = NDHASGIANT(&nd);
@@ -1656,6 +1653,8 @@
 		VFS_UNLOCK_GIANT(vfslocked);
 		goto out;
 	}
+	NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT |
+	    SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, ldvp);
 	if ((error = namei(&nd)) == 0) {
 		lvfslocked = NDHASGIANT(&nd);
 		if (nd.ni_vp != NULL) {
@@ -4028,6 +4027,7 @@
 		vrele(fromnd.ni_startdir);
 	VFS_UNLOCK_GIANT(fvfslocked);
 	VFS_UNLOCK_GIANT(tvfslocked);
+
 out2:
 	if (frdvp) {
 		fvfslocked = VFS_NEEDSGIANT(frdvp->v_mount);