PERFORCE change 137863 for review

[John Birrell]

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

Change 137863 by jb at jb_freebsd8 on 2008/03/16 21:08:40

	Fix a mismerge.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 (text+ko) ====

@@ -1113,7 +1113,7 @@
 		int ltype = 0;
 
 		if (cnp->cn_flags & ISDOTDOT) {
-			ltype = VOP_ISLOCKED(dvp, td);
+			ltype = VOP_ISLOCKED(dvp);
 			VOP_UNLOCK(dvp, 0);
 		}
 		error = vn_lock(*vpp, cnp->cn_lkflags);