Module Name: src
Committed By: manu
Date: Mon Jul 23 19:06:11 UTC 2012
Modified Files:
src/sys/fs/puffs: puffs_node.c puffs_vnops.c
Log Message:
Backout NCHNAMLEN check for cache_enter. That change collided with rmind's
move of this exact check into cache_enter
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/fs/puffs/puffs_node.c
cvs rdiff -u -r1.169 -r1.170 src/sys/fs/puffs/puffs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/puffs/puffs_node.c
diff -u src/sys/fs/puffs/puffs_node.c:1.26 src/sys/fs/puffs/puffs_node.c:1.27
--- src/sys/fs/puffs/puffs_node.c:1.26 Mon Jul 23 12:15:30 2012
+++ src/sys/fs/puffs/puffs_node.c Mon Jul 23 19:06:10 2012
@@ -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 @@ puffs_newnode(struct mount *mp, struct v
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;
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.169 src/sys/fs/puffs/puffs_vnops.c:1.170
--- src/sys/fs/puffs/puffs_vnops.c:1.169 Mon Jul 23 12:15:30 2012
+++ src/sys/fs/puffs/puffs_vnops.c Mon Jul 23 19:06:10 2012
@@ -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 @@ puffs_vnop_lookup(void *v)
/* 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 @@ puffs_vnop_lookup(void *v)
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 */
