PERFORCE change 109984 for review

[Todd Miller]

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

Change 109984 by millert at millert_g5tower on 2006/11/14 20:37:41

	Fix merge error; remove stray vnode_unlock() call.
	g/c unused vars

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#20 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#20 (text+ko) ====

@@ -254,9 +254,7 @@
 {
 	struct devnode *dnp;
 	struct fdescnode *fnp;
-	struct fileglob *fg;
-	struct proc *p;
-	int error, fd;
+	int error;
 
 	error = 0;
 
@@ -1005,7 +1003,6 @@
 		MAC_PERFORM(vnode_label_associate_posixsem,
 		    vfs_context_ucred(ctx), psem, psem->psem_label,
 		    vp, vp->v_label);
-		vnode_unlock(vp);
 		break;
 	case DTYPE_PIPE:
 		/* XXX: should PIPE_LOCK */