From owner-p4-projects@FreeBSD.ORG  Sun Jun 26 09:57:47 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DC5BE1065672; Sun, 26 Jun 2011 09:57:46 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 924C81065670
	for <perforce@FreeBSD.org>; Sun, 26 Jun 2011 09:57:46 +0000 (UTC)
	(envelope-from ilya@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 802B18FC08
	for <perforce@FreeBSD.org>; Sun, 26 Jun 2011 09:57:46 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p5Q9vkLY012749
	for <perforce@FreeBSD.org>; Sun, 26 Jun 2011 09:57:46 GMT
	(envelope-from ilya@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5Q9vkbn012746
	for perforce@freebsd.org; Sun, 26 Jun 2011 09:57:46 GMT
	(envelope-from ilya@FreeBSD.org)
Date: Sun, 26 Jun 2011 09:57:46 GMT
Message-Id: <201106260957.p5Q9vkbn012746@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	ilya@FreeBSD.org using -f
From: Ilya Putsikau <ilya@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 195358 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Jun 2011 09:57:47 -0000

http://p4web.freebsd.org/@@195358?ac=10

Change 195358 by ilya@ilya_triton2011 on 2011/06/26 09:56:46

	Add lookup_cache_enable sysctl
	Check dvp != NULL before calling cache_enter

Affected files ...

.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#11 edit
.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#30 edit

Differences ...

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#11 (text+ko) ====

@@ -187,7 +187,9 @@
 	    MPASS(!(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.'));
 	    VTOFUD(*vpp)->parent_nid = VTOI(dvp);
     }
-    if (cnp != NULL && (cnp->cn_flags & MAKEENTRY) != 0) {
+    if (dvp != NULL && cnp != NULL && (cnp->cn_flags & MAKEENTRY) != 0) {
+        ASSERT_VOP_LOCKED(*vpp, "fuse_vnode_get");
+        ASSERT_VOP_LOCKED(dvp, "fuse_vnode_get");
         cache_enter(dvp, *vpp, cnp);
     }
     VTOFUD(*vpp)->nlookup++;

==== //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#30 (text+ko) ====

@@ -122,6 +122,10 @@
 SYSCTL_ULONG(_vfs_fuse, OID_AUTO, lookup_cache_misses, CTLFLAG_RD,
              &fuse_lookup_cache_misses, 0, "");
 
+int fuse_lookup_cache_enable = 1;
+SYSCTL_INT(_vfs_fuse, OID_AUTO, lookup_cache_enable, CTLFLAG_RW,
+           &fuse_lookup_cache_enable, 0, "");
+
 int fuse_pbuf_freecnt = -1;
 
 /*
@@ -695,7 +699,7 @@
         fdisp_init(&fdi, 0);
         op = FUSE_GETATTR;
         goto calldaemon;
-    } else {
+    } else if (fuse_lookup_cache_enable) {
         err = cache_lookup(dvp, vpp, cnp);
         switch (err) {