Index: sys/kern/vfs_cache.c
===================================================================
RCS file: /cvsroot/src/sys/kern/vfs_cache.c,v
retrieving revision 1.119
diff -p -u -r1.119 vfs_cache.c
--- sys/kern/vfs_cache.c	18 Mar 2017 22:04:52 -0000	1.119
+++ sys/kern/vfs_cache.c	18 Mar 2017 22:10:11 -0000
@@ -282,7 +282,6 @@ static struct namecache *cache_lookup_en
     const struct vnode *, const char *, size_t);
 static void cache_thread(void *);
 static void cache_invalidate(struct namecache *);
-static void cache_disassociate(struct namecache *);
 static void cache_reclaim(void);
 static int cache_ctor(void *, void *, int);
 static void cache_dtor(void *, void *);
@@ -355,35 +354,6 @@ cache_invalidate(struct namecache *ncp)
 }
 
 /*
- * Disassociate a namecache entry from any vnodes it is attached to,
- * and remove from the global LRU list.
- */
-static void
-cache_disassociate(struct namecache *ncp)
-{
-
-	KASSERT(mutex_owned(namecache_lock));
-	KASSERT(ncp->nc_dvp == NULL);
-
-	if (ncp->nc_lru.tqe_prev != NULL) {
-		TAILQ_REMOVE(&nclruhead, ncp, nc_lru);
-		ncp->nc_lru.tqe_prev = NULL;
-	}
-	if (ncp->nc_vhash.le_prev != NULL) {
-		LIST_REMOVE(ncp, nc_vhash);
-		ncp->nc_vhash.le_prev = NULL;
-	}
-	if (ncp->nc_vlist.le_prev != NULL) {
-		LIST_REMOVE(ncp, nc_vlist);
-		ncp->nc_vlist.le_prev = NULL;
-	}
-	if (ncp->nc_dvlist.le_prev != NULL) {
-		LIST_REMOVE(ncp, nc_dvlist);
-		ncp->nc_dvlist.le_prev = NULL;
-	}
-}
-
-/*
  * Lock all CPUs to prevent any cache lookup activity.  Conceptually,
  * this locks out all "readers".
  */
@@ -1063,7 +1033,6 @@ cache_purge1(struct vnode *vp, const cha
 			mutex_enter(&ncp->nc_lock);
 			cache_invalidate(ncp);
 			mutex_exit(&ncp->nc_lock);
-			cache_disassociate(ncp);
 		}
 	}
 	if (flags & PURGE_CHILDREN) {
@@ -1074,7 +1043,6 @@ cache_purge1(struct vnode *vp, const cha
 			mutex_enter(&ncp->nc_lock);
 			cache_invalidate(ncp);
 			mutex_exit(&ncp->nc_lock);
-			cache_disassociate(ncp);
 		}
 	}
 	if (name != NULL) {
@@ -1083,7 +1051,6 @@ cache_purge1(struct vnode *vp, const cha
 		if (ncp) {
 			cache_invalidate(ncp);
 			mutex_exit(&ncp->nc_lock);
-			cache_disassociate(ncp);
 		}
 	}
 	mutex_exit(namecache_lock);
@@ -1106,7 +1073,6 @@ cache_purgevfs(struct mount *mp)
 		if (ncp->nc_dvp != NULL && ncp->nc_dvp->v_mount == mp) {
 			/* Free the resources we had. */
 			cache_invalidate(ncp);
-			cache_disassociate(ncp);
 		}
 		mutex_exit(&ncp->nc_lock);
 	}
@@ -1157,7 +1123,6 @@ cache_prune(int incache, int target)
 		mutex_enter(&ncp->nc_lock);
 		if (ncp->nc_dvp != NULL) {
 			cache_invalidate(ncp);
-			cache_disassociate(ncp);
 			incache--;
 		}
 		mutex_exit(&ncp->nc_lock);
@@ -1200,12 +1165,12 @@ cache_reclaim(void)
 	cache_gcpend = 0;
 	while (ncp != NULL) {
 		next = ncp->nc_gcqueue;
-		cache_disassociate(ncp);
 		KASSERT(ncp->nc_dvp == NULL);
-		if (ncp->nc_hash.le_prev != NULL) {
-			LIST_REMOVE(ncp, nc_hash);
-			ncp->nc_hash.le_prev = NULL;
-		}
+		TAILQ_REMOVE(&nclruhead, ncp, nc_lru);
+		LIST_REMOVE(ncp, nc_vhash);
+		LIST_REMOVE(ncp, nc_vlist);
+		LIST_REMOVE(ncp, nc_dvlist);
+		LIST_REMOVE(ncp, nc_hash);
 		pool_cache_put(namecache_cache, ncp);
 		ncp = next;
 	}