[src/trunk]: src/sys/fs/puffs Backout NCHNAMLEN check for cache_enter. That c...

[manu <manu%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/91609ee331c4
branches:  trunk
changeset: 780439:91609ee331c4
user:      manu <manu%NetBSD.org@localhost>
date:      Mon Jul 23 19:06:10 2012 +0000

description:
Backout NCHNAMLEN check for cache_enter. That change collided with rmind's
move of this exact check into cache_enter

diffstat:

 sys/fs/puffs/puffs_node.c  |  6 +++---
 sys/fs/puffs/puffs_vnops.c |  9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r 6d1f283d5fb8 -r 91609ee331c4 sys/fs/puffs/puffs_node.c
--- a/sys/fs/puffs/puffs_node.c Mon Jul 23 16:27:44 2012 +0000
+++ b/sys/fs/puffs/puffs_node.c Mon Jul 23 19:06:10 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: puffs_node.c,v 1.26 2012/07/23 12:15:30 manu Exp $     */
+/*     $NetBSD: puffs_node.c,v 1.27 2012/07/23 19:06:10 manu Exp $     */
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.26 2012/07/23 12:15:30 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.27 2012/07/23 19:06:10 manu Exp $");
 
 #include <sys/param.h>
 #include <sys/hash.h>
@@ -246,7 +246,7 @@
        vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
        *vpp = vp;
 
-       if (PUFFS_USE_NAMECACHE(pmp) && (cnp->cn_namelen <= NCHNAMLEN))
+       if (PUFFS_USE_NAMECACHE(pmp))
                cache_enter(dvp, vp, cnp);
 
        return 0;
diff -r 6d1f283d5fb8 -r 91609ee331c4 sys/fs/puffs/puffs_vnops.c
--- a/sys/fs/puffs/puffs_vnops.c        Mon Jul 23 16:27:44 2012 +0000
+++ b/sys/fs/puffs/puffs_vnops.c        Mon Jul 23 19:06:10 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: puffs_vnops.c,v 1.169 2012/07/23 12:15:30 manu Exp $   */
+/*     $NetBSD: puffs_vnops.c,v 1.170 2012/07/23 19:06:10 manu Exp $   */
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.169 2012/07/23 12:15:30 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.170 2012/07/23 19:06:10 manu Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -587,8 +587,7 @@
                        /* save negative cache entry */
                        } else {
                                if (PUFFS_USE_NAMECACHE(pmp) &&
-                                   !PUFFS_USE_FS_TTL(pmp) &&
-                                   (cnp->cn_namelen <= NCHNAMLEN))
+                                   !PUFFS_USE_FS_TTL(pmp))
                                        cache_enter(dvp, NULL, cnp);
                        }
                }
@@ -664,7 +663,7 @@
        KASSERT(lookup_msg->pvnr_newnode == VPTOPP(vp)->pn_cookie);
        *ap->a_vpp = vp;
 
-       if (PUFFS_USE_NAMECACHE(pmp) && (cnp->cn_namelen <= NCHNAMLEN))
+       if (PUFFS_USE_NAMECACHE(pmp))
                cache_enter(dvp, vp, cnp);
 
        /* XXX */