PERFORCE change 123977 for review

[Roman Divacky]

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

Change 123977 by rdivacky at 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);