PERFORCE change 143167 for review

[John Birrell]

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

Change 143167 by jb at freebsd3 on 2008/06/09 03:20:52

	Update to reflect the releng6 ABI.

Affected files ...

.. //depot/projects/dtrace6/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 edit

Differences ...

==== //depot/projects/dtrace6/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/vnode.h,v 1.6 2008/03/28 22:16:06 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/vnode.h,v 1.6.2.1 2008/04/17 01:23:30 jb Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_VNODE_H_
@@ -170,12 +170,12 @@
 		td->td_proc->p_fd->fd_cdir = rootvnode;
 
 	NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, pnamep, td);
-	error = vn_open_cred(&nd, &filemode, createmode, td->td_ucred, NULL);
+	error = vn_open_cred(&nd, &filemode, createmode, td->td_ucred, 0);
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	if (error == 0) {
 		/* We just unlock so we hold a reference. */
 		VN_HOLD(nd.ni_vp);
-		VOP_UNLOCK(nd.ni_vp, 0);
+		VOP_UNLOCK(nd.ni_vp, 0, td);
 		*vpp = nd.ni_vp;
 	}
 	return (error);
@@ -213,6 +213,7 @@
 static __inline int
 zfs_vop_fsync(vnode_t *vp, int flag, cred_t *cr)
 {
+	struct thread *td = curthread;
 	struct mount *mp;
 	int error, vfslocked;
 
@@ -221,9 +222,9 @@
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
 	if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
 		goto drop;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-	error = VOP_FSYNC(vp, MNT_WAIT, curthread);
-	VOP_UNLOCK(vp, 0);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
+	error = VOP_FSYNC(vp, MNT_WAIT, td);
+	VOP_UNLOCK(vp, 0, td);
 	vn_finished_write(mp);
 drop:
 	VFS_UNLOCK_GIANT(vfslocked);