 @@ -1,14 +1,14 @@
-/* $NetBSD: nilfs_vnops.c,v 1.9 2010/11/30 10:43:03 dholland Exp $ */
+/* $NetBSD: nilfs_vnops.c,v 1.10 2011/04/24 21:35:29 rmind Exp $ */
 /*
  * Copyright (c) 2008, 2009 Reinoud Zandijk
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.9 2010/11/30 10:43:03 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.10 2011/04/24 21:35:29 rmind Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>	/* defines plimit structure in proc struct */
 #include <sys/kernel.h>
 #include <sys/file.h>		/* define FWRITE ... */
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 @@ -1149,35 +1149,29 @@ nilfs_mkdir(void *v)
 	return error;
+}
 /* --------------------------------------------------------------------- */
 static int
 nilfs_do_link(struct vnode *dvp, struct vnode *vp, struct componentname *cnp)
+{
 	struct nilfs_node *nilfs_node, *dir_node;
 	struct vattr vap;
 	int error;
 	DPRINTF(VFSCALL, ("nilfs_link called\n"));
-	error = 0;
+	KASSERT(dvp != vp);
 	KASSERT(vp->v_type != VDIR);
-	/* some quick checks */
+	KASSERT(dvp->v_mount == vp->v_mount);
 	if (vp->v_type == VDIR)
 		return EPERM;		/* can't link a directory */
 	if (dvp->v_mount != vp->v_mount)
 		return EXDEV;		/* can't link across devices */
 	if (dvp == vp)
 		return EPERM;		/* can't be the same */
 	/* lock node */
 	error = vn_lock(vp, LK_EXCLUSIVE);
 	if (error)
 		return error;
 	/* get attributes */
 	dir_node = VTOI(dvp);
 	nilfs_node = VTOI(vp);
 	error = VOP_GETATTR(vp, &vap, FSCRED);
 	if (error) {
 		VOP_UNLOCK(vp);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tmpfs_vnops.c,v 1.76 2011/01/13 13:35:12 pooka Exp $	*/
+/*	$NetBSD: tmpfs_vnops.c,v 1.77 2011/04/24 21:35:29 rmind Exp $	*/
 /*
  * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal, developed as part of Google's Summer of Code
  * 2005 program.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * tmpfs vnode interface.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.76 2011/01/13 13:35:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.77 2011/04/24 21:35:29 rmind Exp $");
 #include <sys/param.h>
 #include <sys/dirent.h>
 #include <sys/fcntl.h>
 #include <sys/event.h>
 #include <sys/malloc.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
 #include <sys/lockf.h>
 @@ -727,64 +727,54 @@ tmpfs_remove(void *v)
 	error = 0;
 out:
 	vput(vp);
 	if (dvp == vp)
 		vrele(dvp);
 	else
 		vput(dvp);
 	return error;
+}
-/* --------------------------------------------------------------------- */
+/*
  * tmpfs:link: create hard link.
  */
 int
 tmpfs_link(void *v)
+{
-	struct vnode *dvp = ((struct vop_link_args *)v)->a_dvp;
+	struct vop_link_args /* {
-	struct vnode *vp = ((struct vop_link_args *)v)->a_vp;
+		struct vnode *a_dvp;
-	struct componentname *cnp = ((struct vop_link_args *)v)->a_cnp;
+		struct vnode *a_vp;
 		struct componentname *a_cnp;
-	int error;
+	} */ *ap = v;
 	struct vnode *dvp = ap->a_dvp;
 	struct vnode *vp = ap->a_vp;
 	struct componentname *cnp = ap->a_cnp;;
 	struct tmpfs_node *dnode, *node;
 	struct tmpfs_dirent *de;
-	struct tmpfs_node *dnode;
+	int error;
 	struct tmpfs_node *node;
 	KASSERT(dvp != vp);
 	KASSERT(VOP_ISLOCKED(dvp));
-	KASSERT(dvp != vp); /* XXX When can this be false? */
+	KASSERT(vp->v_type != VDIR);
 	KASSERT(dvp->v_mount == vp->v_mount);
 	dnode = VP_TO_TMPFS_DIR(dvp);
 	node = VP_TO_TMPFS_NODE(vp);
 	/* Lock vp because we will need to run tmpfs_update over it, which
 	 * needs the vnode to be locked. */
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	/* XXX: Why aren't the following two tests done by the caller? */
 	/* Hard links of directories are forbidden. */
 	if (vp->v_type == VDIR) {
 		error = EPERM;
 		goto out;
 	/* Cannot create cross-device links. */
 	if (dvp->v_mount != vp->v_mount) {
 		error = EXDEV;
 		goto out;
 	/* Ensure that we do not overflow the maximum number of links imposed
 	 * by the system. */
 	KASSERT(node->tn_links <= LINK_MAX);
 	if (node->tn_links == LINK_MAX) {
 		error = EMLINK;
 		goto out;
+	}
 	/* We cannot create links of files marked immutable or append-only. */
 	if (node->tn_flags & (IMMUTABLE | APPEND)) {
 		error = EPERM;
 		goto out;
+	}

 @@ -1,14 +1,14 @@
-/* $NetBSD: udf_vnops.c,v 1.62 2011/01/02 05:09:30 dholland Exp $ */
+/* $NetBSD: udf_vnops.c,v 1.63 2011/04/24 21:35:30 rmind Exp $ */
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * Generic parts are derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal, developed as part of Google's Summer of Code
  * 2005 program.
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.62 2011/01/02 05:09:30 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.63 2011/04/24 21:35:30 rmind Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>	/* defines plimit structure in proc struct */
 #include <sys/kernel.h>
 #include <sys/file.h>		/* define FWRITE ... */
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 @@ -1471,35 +1471,29 @@ udf_mkdir(void *v)
 	return error;
+}
 /* --------------------------------------------------------------------- */
 static int
 udf_do_link(struct vnode *dvp, struct vnode *vp, struct componentname *cnp)
+{
 	struct udf_node *udf_node, *dir_node;
 	struct vattr vap;
 	int error;
 	DPRINTF(CALL, ("udf_link called\n"));
-	error = 0;
+	KASSERT(dvp != vp);
 	KASSERT(vp->v_type != VDIR);
-	/* some quick checks */
+	KASSERT(dvp->v_mount == vp->v_mount);
 	if (vp->v_type == VDIR)
 		return EPERM;		/* can't link a directory */
 	if (dvp->v_mount != vp->v_mount)
 		return EXDEV;		/* can't link across devices */
 	if (dvp == vp)
 		return EPERM;		/* can't be the same */
 	/* lock node */
 	error = vn_lock(vp, LK_EXCLUSIVE);
 	if (error)
 		return error;
 	/* get attributes */
 	dir_node = VTOI(dvp);
 	udf_node = VTOI(vp);
 	error = VOP_GETATTR(vp, &vap, FSCRED);
 	if (error) {
 		VOP_UNLOCK(vp);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_syscalls.c,v 1.422 2011/04/10 15:45:33 christos Exp $	*/
+/*	$NetBSD: vfs_syscalls.c,v 1.423 2011/04/24 21:35:29 rmind Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,27 +60,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vfs_syscalls.c	8.42 (Berkeley) 7/31/95
  */
 /*
  * Virtual File System System Calls
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.422 2011/04/10 15:45:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.423 2011/04/24 21:35:29 rmind Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_fileassoc.h"
 #include "veriexec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 @@ -1757,29 +1757,32 @@ sys_link(struct lwp *l, const struct sys
 	if (error != 0)
 		return (error);
 	error = pathbuf_copyin(SCARG(uap, link), &linkpb);
 	if (error) {
 		goto out1;
+	}
 	NDINIT(&nd, CREATE, LOCKPARENT | TRYEMULROOT, linkpb);
 	if ((error = namei(&nd)) != 0)
 		goto out2;
 	if (nd.ni_vp) {
 		error = EEXIST;
 		goto abortop;
+	}
-	/*
+	/* Prevent hard links on directories. */
-	 * Prevent cross-mount operation.
+	if (vp->v_type == VDIR) {
-	 */
+		error = EPERM;
 		goto abortop;
+	}
 	/* Prevent cross-mount operation. */
 	if (nd.ni_dvp->v_mount != vp->v_mount) {
 		error = EXDEV;
 		goto abortop;
+	}
 	error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd);
 out2:
 	pathbuf_destroy(linkpb);
 out1:
 	vrele(vp);
 	return (error);
 abortop:
 	VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
 	if (nd.ni_dvp == nd.ni_vp)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nfs_vnops.c,v 1.289 2010/12/14 16:58:58 cegger Exp $	*/
+/*	$NetBSD: nfs_vnops.c,v 1.290 2011/04/24 21:35:30 rmind Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -29,27 +29,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)nfs_vnops.c	8.19 (Berkeley) 7/31/95
  */
 /*
  * vnode op calls for Sun NFS version 2 and 3
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.289 2010/12/14 16:58:58 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.290 2011/04/24 21:35:30 rmind Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
 #include "opt_uvmhist.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
 @@ -2040,54 +2040,47 @@ nfs_linkrpc(struct vnode *dvp, struct vn
 int
 nfs_link(void *v)
+{
 	struct vop_link_args /* {
 		struct vnode *a_dvp;
 		struct vnode *a_vp;
 		struct componentname *a_cnp;
 	} */ *ap = v;
 	struct vnode *vp = ap->a_vp;
 	struct vnode *dvp = ap->a_dvp;
 	struct componentname *cnp = ap->a_cnp;
 	int error = 0;
-	if (dvp->v_mount != vp->v_mount) {
+	error = vn_lock(vp, LK_EXCLUSIVE);
 	if (error != 0) {
 		VOP_ABORTOP(dvp, cnp);
 		vput(dvp);
-		return (EXDEV);
+		return error;
 	if (dvp != vp) {
 		error = vn_lock(vp, LK_EXCLUSIVE);
 		if (error != 0) {
 			VOP_ABORTOP(dvp, cnp);
 			vput(dvp);
 			return error;
+	}
 	/*
 	 * Push all writes to the server, so that the attribute cache
 	 * doesn't get "out of sync" with the server.
 	 * XXX There should be a better way!
 	 */
 	VOP_FSYNC(vp, cnp->cn_cred, FSYNC_WAIT, 0, 0);
 	error = nfs_linkrpc(dvp, vp, cnp->cn_nameptr, cnp->cn_namelen,
 	    cnp->cn_cred, curlwp);
-	if (error == 0)
+	if (error == 0) {
 		cache_purge1(dvp, cnp, 0);
 	if (dvp != vp)
-		VOP_UNLOCK(vp);
+	VOP_UNLOCK(vp);
 	VN_KNOTE(vp, NOTE_LINK);
 	VN_KNOTE(dvp, NOTE_WRITE);
 	vput(dvp);
 	return (error);
+}
 /*
  * nfs symbolic link create call
  */
 int
 nfs_symlink(void *v)
+{
 	struct vop_symlink_args /* {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ext2fs_vnops.c,v 1.97 2011/01/02 05:09:32 dholland Exp $	*/
+/*	$NetBSD: ext2fs_vnops.c,v 1.98 2011/04/24 21:35:30 rmind Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -55,27 +55,27 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  *	@(#)ufs_vnops.c	8.14 (Berkeley) 10/26/94
  * Modified for ext2fs by Manuel Bouyer.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.97 2011/01/02 05:09:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.98 2011/04/24 21:35:30 rmind Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/lockf.h>
 @@ -542,79 +542,73 @@ ext2fs_remove(void *v)
+	}
 	VN_KNOTE(vp, NOTE_DELETE);
 	VN_KNOTE(dvp, NOTE_WRITE);
 	if (dvp == vp)
 		vrele(vp);
 	else
 		vput(vp);
 	vput(dvp);
 	return (error);
+}
 /*
- * link vnode call
+ * ext2fs_link: create hard link.
  */
 int
 ext2fs_link(void *v)
+{
 	struct vop_link_args /* {
 		struct vnode *a_dvp;
 		struct vnode *a_vp;
 		struct componentname *a_cnp;
 	} */ *ap = v;
 	struct vnode *dvp = ap->a_dvp;
 	struct vnode *vp = ap->a_vp;
 	struct componentname *cnp = ap->a_cnp;
 	struct inode *ip;
 	int error;
-	if (vp->v_type == VDIR) {
+	KASSERT(dvp != vp);
-		VOP_ABORTOP(dvp, cnp);
+	KASSERT(vp->v_type != VDIR);
-		error = EISDIR;
+	KASSERT(dvp->v_mount == vp->v_mount);
 		goto out2;
 	error = vn_lock(vp, LK_EXCLUSIVE);
-	if (dvp->v_mount != vp->v_mount) {
+	if (error) {
 		VOP_ABORTOP(dvp, cnp);
 		error = EXDEV;
 		goto out2;
 	if (dvp != vp && (error = vn_lock(vp, LK_EXCLUSIVE))) {
 		VOP_ABORTOP(dvp, cnp);
 		goto out2;
+	}
 	ip = VTOI(vp);
 	if ((nlink_t)ip->i_e2fs_nlink >= LINK_MAX) {
 		VOP_ABORTOP(dvp, cnp);
 		error = EMLINK;
 		goto out1;
+	}
 	if (ip->i_e2fs_flags & (EXT2_IMMUTABLE | EXT2_APPEND)) {
 		VOP_ABORTOP(dvp, cnp);
 		error = EPERM;
 		goto out1;
+	}
 	ip->i_e2fs_nlink++;
 	ip->i_flag |= IN_CHANGE;
 	error = ext2fs_update(vp, NULL, NULL, UPDATE_WAIT);
 	if (!error)
 		error = ext2fs_direnter(ip, dvp, cnp);
 	if (error) {
 		ip->i_e2fs_nlink--;
 		ip->i_flag |= IN_CHANGE;
+	}
 out1:
-	if (dvp != vp)
+	VOP_UNLOCK(vp);
 		VOP_UNLOCK(vp);
 out2:
 	VN_KNOTE(vp, NOTE_LINK);
 	VN_KNOTE(dvp, NOTE_WRITE);
 	vput(dvp);
 	return (error);
+}
 /*
  * Rename system call.
  *	rename("foo", "bar");
  * is essentially
  *	unlink("bar");
  *	link("foo", "bar");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_vnops.c,v 1.187 2011/03/06 17:08:39 bouyer Exp $	*/
+/*	$NetBSD: ufs_vnops.c,v 1.188 2011/04/24 21:35:30 rmind Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -56,27 +56,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ufs_vnops.c	8.28 (Berkeley) 7/31/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.187 2011/03/06 17:08:39 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.188 2011/04/24 21:35:30 rmind Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
 #include "opt_quota.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 @@ -776,58 +776,50 @@ ufs_remove(void *v)
+	}
 	VN_KNOTE(vp, NOTE_DELETE);
 	VN_KNOTE(dvp, NOTE_WRITE);
 	if (dvp == vp)
 		vrele(vp);
 	else
 		vput(vp);
 	vput(dvp);
 	fstrans_done(dvp->v_mount);
 	return (error);
+}
 /*
- * link vnode call
+ * ufs_link: create hard link.
  */
 int
 ufs_link(void *v)
+{
 	struct vop_link_args /* {
 		struct vnode *a_dvp;
 		struct vnode *a_vp;
 		struct componentname *a_cnp;
 	} */ *ap = v;
-	struct vnode		*vp, *dvp;
+	struct vnode *dvp = ap->a_dvp;
-	struct componentname	*cnp;
+	struct vnode *vp = ap->a_vp;
-	struct inode		*ip;
+	struct componentname *cnp = ap->a_cnp;
-	struct direct		*newdir;
+	struct inode *ip;
-	int			error;
+	struct direct *newdir;
 	int error;
-	dvp = ap->a_dvp;
+	KASSERT(dvp != vp);
-	vp = ap->a_vp;
+	KASSERT(vp->v_type != VDIR);
-	cnp = ap->a_cnp;
+	KASSERT(dvp->v_mount == vp->v_mount);
 	fstrans_start(dvp->v_mount, FSTRANS_SHARED);
-	if (vp->v_type == VDIR) {
+	error = vn_lock(vp, LK_EXCLUSIVE);
-		VOP_ABORTOP(dvp, cnp);
+	if (error) {
 		error = EPERM;
 		goto out2;
 	if (dvp->v_mount != vp->v_mount) {
 		VOP_ABORTOP(dvp, cnp);
 		error = EXDEV;
 		goto out2;
 	if (dvp != vp && (error = vn_lock(vp, LK_EXCLUSIVE))) {
 		VOP_ABORTOP(dvp, cnp);
 		goto out2;
+	}
 	ip = VTOI(vp);
 	if ((nlink_t)ip->i_nlink >= LINK_MAX) {
 		VOP_ABORTOP(dvp, cnp);
 		error = EMLINK;
 		goto out1;
+	}
 	if (ip->i_flags & (IMMUTABLE | APPEND)) {
 		VOP_ABORTOP(dvp, cnp);
 		error = EPERM;
 		goto out1;
 @@ -845,28 +837,27 @@ ufs_link(void *v)
 		newdir = pool_cache_get(ufs_direct_cache, PR_WAITOK);
 		ufs_makedirentry(ip, cnp, newdir);
 		error = ufs_direnter(dvp, vp, newdir, cnp, NULL);
 		pool_cache_put(ufs_direct_cache, newdir);
+	}
 	if (error) {
 		ip->i_nlink--;
 		DIP_ASSIGN(ip, nlink, ip->i_nlink);
 		ip->i_flag |= IN_CHANGE;
 		UFS_WAPBL_UPDATE(vp, NULL, NULL, UPDATE_DIROP);
+	}
 	UFS_WAPBL_END(vp->v_mount);
  out1:
-	if (dvp != vp)
+	VOP_UNLOCK(vp);
 		VOP_UNLOCK(vp);
  out2:
 	VN_KNOTE(vp, NOTE_LINK);
 	VN_KNOTE(dvp, NOTE_WRITE);
 	vput(dvp);
 	fstrans_done(dvp->v_mount);
 	return (error);
+}
 /*
  * whiteout vnode call
  */
 int
 ufs_whiteout(void *v)