 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_vnode.c,v 1.36 2014/05/08 08:21:53 hannken Exp $	*/
+/*	$NetBSD: vfs_vnode.c,v 1.37 2014/07/05 09:33:15 hannken Exp $	*/
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, and 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
 @@ -106,27 +106,27 @@
  *	from zero, the interlock must be held.  To change from a non-zero
  *	value to zero, again the interlock must be held.
+ *
  *	Changing the usecount from a non-zero value to a non-zero value can
  *	safely be done using atomic operations, without the interlock held.
+ *
  *	Note: if VI_CLEAN is set, vnode_t::v_interlock will be released while
  *	mntvnode_lock is still held.
+ *
  *	See PR 41374.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.36 2014/05/08 08:21:53 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.37 2014/07/05 09:33:15 hannken Exp $");
 #define _VFS_VNODE_PRIVATE
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/hash.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 @@ -1314,26 +1314,108 @@ again:
 		vp->v_vflag |= VV_MPSAFE;
 	vfs_unbusy(mp, true, NULL);
 	/* Finished loading, finalize node. */
 	mutex_enter(&vcache.lock);
 	new_node->vn_key.vk_key = new_key;
 	new_node->vn_vnode = vp;
 	mutex_exit(&vcache.lock);
 	*vpp = vp;
 	return 0;
+}
 /*
  * Prepare key change: lock old and new cache node.
  * Return an error if the new node already exists.
  */
 int
 vcache_rekey_enter(struct mount *mp, struct vnode *vp,
     const void *old_key, size_t old_key_len,
     const void *new_key, size_t new_key_len)
+{
 	uint32_t old_hash, new_hash;
 	struct vcache_key old_vcache_key, new_vcache_key;
 	struct vcache_node *node, *new_node;
 	old_vcache_key.vk_mount = mp;
 	old_vcache_key.vk_key = old_key;
 	old_vcache_key.vk_key_len = old_key_len;
 	old_hash = vcache_hash(&old_vcache_key);
 	new_vcache_key.vk_mount = mp;
 	new_vcache_key.vk_key = new_key;
 	new_vcache_key.vk_key_len = new_key_len;
 	new_hash = vcache_hash(&new_vcache_key);
 	new_node = pool_cache_get(vcache.pool, PR_WAITOK);
 	new_node->vn_vnode = NULL;
 	new_node->vn_key = new_vcache_key;
 	mutex_enter(&vcache.lock);
 	node = vcache_hash_lookup(&new_vcache_key, new_hash);
 	if (node != NULL) {
 		mutex_exit(&vcache.lock);
 		pool_cache_put(vcache.pool, new_node);
 		return EEXIST;
+	}
 	SLIST_INSERT_HEAD(&vcache.hashtab[new_hash & vcache.hashmask],
 	    new_node, vn_hash);
 	node = vcache_hash_lookup(&old_vcache_key, old_hash);
 	KASSERT(node != NULL);
 	KASSERT(node->vn_vnode == vp);
 	node->vn_vnode = NULL;
 	node->vn_key = old_vcache_key;
 	mutex_exit(&vcache.lock);
 	return 0;
+}
 /*
  * Key change complete: remove old node and unlock new node.
  */
 void
 vcache_rekey_exit(struct mount *mp, struct vnode *vp,
     const void *old_key, size_t old_key_len,
     const void *new_key, size_t new_key_len)
+{
 	uint32_t old_hash, new_hash;
 	struct vcache_key old_vcache_key, new_vcache_key;
 	struct vcache_node *node;
 	old_vcache_key.vk_mount = mp;
 	old_vcache_key.vk_key = old_key;
 	old_vcache_key.vk_key_len = old_key_len;
 	old_hash = vcache_hash(&old_vcache_key);
 	new_vcache_key.vk_mount = mp;
 	new_vcache_key.vk_key = new_key;
 	new_vcache_key.vk_key_len = new_key_len;
 	new_hash = vcache_hash(&new_vcache_key);
 	mutex_enter(&vcache.lock);
 	node = vcache_hash_lookup(&new_vcache_key, new_hash);
 	KASSERT(node != NULL && node->vn_vnode == NULL);
 	KASSERT(node->vn_key.vk_key_len == new_key_len);
 	node->vn_vnode = vp;
 	node->vn_key = new_vcache_key;
 	node = vcache_hash_lookup(&old_vcache_key, old_hash);
 	KASSERT(node != NULL);
 	KASSERT(node->vn_vnode == NULL);
 	SLIST_REMOVE(&vcache.hashtab[old_hash & vcache.hashmask],
 	    node, vcache_node, vn_hash);
 	mutex_exit(&vcache.lock);
 	pool_cache_put(vcache.pool, node);
+}
 /*
  * Remove a vnode / fs node pair from the cache.
  */
 void
 vcache_remove(struct mount *mp, const void *key, size_t key_len)
+{
 	uint32_t hash;
 	struct vcache_key vcache_key;
 	struct vcache_node *node;
 	vcache_key.vk_mount = mp;
 	vcache_key.vk_key = key;
 	vcache_key.vk_key_len = key_len;
 	hash = vcache_hash(&vcache_key);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: param.h,v 1.455 2014/07/01 13:25:21 rtr Exp $	*/
+/*	$NetBSD: param.h,v 1.456 2014/07/05 09:33:15 hannken 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:
 @@ -53,27 +53,27 @@
  *	m = minor version; a minor number of 99 indicates current.
  *	r = 0 (*)
  *	p = patchlevel
+ *
  * When new releases are made, src/gnu/usr.bin/groff/tmac/mdoc.local
  * needs to be updated and the changes sent back to the groff maintainers.
+ *
  * (*)	Up to 2.0I "release" used to be "",A-Z,Z[A-Z] but numeric
  *	    	e.g. NetBSD-1.2D  = 102040000 ('D' == 4)
  *	NetBSD-2.0H 	(200080000) was changed on 20041001 to:
  *	2.99.9		(299000900)
  */
-#define	__NetBSD_Version__	699004500	/* NetBSD 6.99.45 */
+#define	__NetBSD_Version__	699004600	/* NetBSD 6.99.46 */
 #define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
     (m) * 1000000) + (p) * 100) <= __NetBSD_Version__)
 /*
  * Historical NetBSD #define
+ *
  * NetBSD 1.4 was the last release for which this value was incremented.
  * The value is now permanently fixed at 199905. It will never be
  * changed again.
+ *
  * New code must use __NetBSD_Version__ instead, and should not even
  * count on NetBSD being defined.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vnode.h,v 1.248 2014/05/25 13:51:26 hannken Exp $	*/
+/*	$NetBSD: vnode.h,v 1.249 2014/07/05 09:33:15 hannken Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * 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.
 @@ -547,26 +547,30 @@ void 	vput(struct vnode *);
 bool	vrecycle(struct vnode *);
 void 	vrele(struct vnode *);
 void 	vrele_async(struct vnode *);
 void	vrele_flush(void);
 int	vtruncbuf(struct vnode *, daddr_t, bool, int);
 void	vwakeup(struct buf *);
 int	vdead_check(struct vnode *, int);
 void	vrevoke(struct vnode *);
 struct vnode *
 	vnalloc(struct mount *);
 void	vnfree(struct vnode *);
 void	vremfree(struct vnode *);
 int	vcache_get(struct mount *, const void *, size_t, struct vnode **);
 int	vcache_rekey_enter(struct mount *, struct vnode *,
 	    const void *, size_t, const void *, size_t);
 void	vcache_rekey_exit(struct mount *, struct vnode *,
 	    const void *, size_t, const void *, size_t);
 void	vcache_remove(struct mount *, const void *, size_t);
 /* see vnsubr(9) */
 int	vn_bwrite(void *);
 int 	vn_close(struct vnode *, int, kauth_cred_t);
 int	vn_isunder(struct vnode *, struct vnode *, struct lwp *);
 int	vn_lock(struct vnode *, int);
 void	vn_markexec(struct vnode *);
 int	vn_marktext(struct vnode *);
 int 	vn_open(struct nameidata *, int, int);
 int 	vn_rdwr(enum uio_rw, struct vnode *, void *, int, off_t, enum uio_seg,
     int, kauth_cred_t, size_t *, struct lwp *);
 int	vn_readdir(struct file *, char *, int, u_int, int *, struct lwp *,