Index: fs/devfs/devfs_vnops.c
===================================================================
RCS file: /usr/repo/src/sys/fs/devfs/devfs_vnops.c,v
retrieving revision 1.146
diff -u -p -r1.146 devfs_vnops.c
--- fs/devfs/devfs_vnops.c	31 May 2007 11:51:49 -0000	1.146
+++ fs/devfs/devfs_vnops.c	3 Jun 2007 23:58:24 -0000
@@ -230,6 +230,7 @@ devfs_allocv(struct devfs_dirent *de, st
 		VI_LOCK(vp);
 		dev_lock();
 		dev_refl(dev);
+		/* XXX: v_rdev should be protect by vnode lock */
 		vp->v_rdev = dev;
 		KASSERT(vp->v_usecount == 1,
 		    ("%s %d (%d)\n", __func__, __LINE__, vp->v_usecount));
Index: fs/fifofs/fifo_vnops.c
===================================================================
RCS file: /usr/repo/src/sys/fs/fifofs/fifo_vnops.c,v
retrieving revision 1.137
diff -u -p -r1.137 fifo_vnops.c
--- fs/fifofs/fifo_vnops.c	31 May 2007 11:51:50 -0000	1.137
+++ fs/fifofs/fifo_vnops.c	4 Jun 2007 00:15:13 -0000
@@ -179,7 +179,7 @@ fifo_open(ap)
 	struct socket *rso, *wso;
 	int error;
 
-	ASSERT_VOP_LOCKED(vp, "fifo_open");
+	ASSERT_VOP_ELOCKED(vp, "fifo_open");
 	if (fp == NULL)
 		return (EINVAL);
 	if ((fip = vp->v_fifoinfo) == NULL) {
Index: kern/uipc_usrreq.c
===================================================================
RCS file: /usr/repo/src/sys/kern/uipc_usrreq.c,v
retrieving revision 1.205
diff -u -p -r1.205 uipc_usrreq.c
--- kern/uipc_usrreq.c	29 May 2007 12:36:00 -0000	1.205
+++ kern/uipc_usrreq.c	3 Jun 2007 23:58:36 -0000
@@ -463,7 +463,7 @@ restart:
 		goto error;
 	}
 	vp = nd.ni_vp;
-	ASSERT_VOP_LOCKED(vp, "uipc_bind");
+	ASSERT_VOP_ELOCKED(vp, "uipc_bind");
 	soun = (struct sockaddr_un *)sodupsockaddr(nam, M_WAITOK);
 
 	UNP_GLOBAL_WLOCK();
Index: kern/vfs_mount.c
===================================================================
RCS file: /usr/repo/src/sys/kern/vfs_mount.c,v
retrieving revision 1.259
diff -u -p -r1.259 vfs_mount.c
--- kern/vfs_mount.c	26 Apr 2007 08:56:56 -0000	1.259
+++ kern/vfs_mount.c	3 Jun 2007 18:17:45 -0000
@@ -1499,8 +1499,8 @@ devfs_fixup(struct thread *td)
 	VFS_ROOT(mp, LK_EXCLUSIVE, &dvp, td);
 	VI_LOCK(dvp);
 	dvp->v_iflag &= ~VI_MOUNT;
-	dvp->v_mountedhere = NULL;
 	VI_UNLOCK(dvp);
+	dvp->v_mountedhere = NULL;
 
 	/* Set up the real rootvnode, and purge the cache */
 	TAILQ_FIRST(&mountlist)->mnt_vnodecovered = NULL;
Index: kern/vfs_vnops.c
===================================================================
RCS file: /usr/repo/src/sys/kern/vfs_vnops.c,v
retrieving revision 1.251
diff -u -p -r1.251 vfs_vnops.c
--- kern/vfs_vnops.c	31 May 2007 11:51:52 -0000	1.251
+++ kern/vfs_vnops.c	4 Jun 2007 00:06:34 -0000
@@ -184,7 +184,7 @@ restart:
 		ndp->ni_cnd.cn_nameiop = LOOKUP;
 		ndp->ni_cnd.cn_flags = ISOPEN |
 		    ((fmode & O_NOFOLLOW) ? NOFOLLOW : FOLLOW) |
-		    LOCKSHARED | LOCKLEAF | MPSAFE | AUDITVNODE1;
+		    LOCKLEAF | MPSAFE | AUDITVNODE1;
 		if ((error = namei(ndp)) != 0)
 			return (error);
 		if (!mpsafe)
@@ -235,7 +235,7 @@ restart:
 	if (fmode & FWRITE)
 		vp->v_writecount++;
 	*flagp = fmode;
-	ASSERT_VOP_LOCKED(vp, "vn_open_cred");
+	ASSERT_VOP_ELOCKED(vp, "vn_open_cred");
 	if (!mpsafe)
 		VFS_UNLOCK_GIANT(vfslocked);
 	return (0);
Index: vm/vnode_pager.c
===================================================================
RCS file: /zoo/pjd/repo/src/sys/vm/vnode_pager.c,v
retrieving revision 1.235
diff -u -p -r1.235 vnode_pager.c
--- vm/vnode_pager.c	4 Jun 2007 21:45:18 -0000	1.235
+++ vm/vnode_pager.c	6 Jun 2007 12:23:50 -0000
@@ -151,7 +151,7 @@ vnode_destroy_vobject(struct vnode *vp)
 	obj = vp->v_object;
 	if (obj == NULL)
 		return;
-	ASSERT_VOP_LOCKED(vp, "vnode_destroy_vobject");
+	ASSERT_VOP_ELOCKED(vp, "vnode_destroy_vobject");
 	VM_OBJECT_LOCK(obj);
 	if (obj->ref_count == 0) {
 		/*
@@ -198,7 +198,7 @@ vnode_pager_alloc(void *handle, vm_ooffs
 
 	vp = (struct vnode *) handle;
 
-	ASSERT_VOP_LOCKED(vp, "vnode_pager_alloc");
+	ASSERT_VOP_ELOCKED(vp, "vnode_pager_alloc");
 
 	/*
 	 * If the object is being terminated, wait for it to
@@ -256,7 +256,7 @@ vnode_pager_dealloc(object)
 		vm_object_clear_flag(object, OBJ_DISCONNECTWNT);
 		wakeup(object);
 	}
-	ASSERT_VOP_LOCKED(vp, "vnode_pager_dealloc");
+	ASSERT_VOP_ELOCKED(vp, "vnode_pager_dealloc");
 	vp->v_object = NULL;
 	vp->v_vflag &= ~VV_TEXT;
 }