From owner-p4-projects@FreeBSD.ORG  Sun Jun 26 09:55:35 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 77F181065670; Sun, 26 Jun 2011 09:55:35 +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 3A48F106564A
	for <perforce@FreeBSD.org>; Sun, 26 Jun 2011 09:55:35 +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 281B88FC0A
	for <perforce@FreeBSD.org>; Sun, 26 Jun 2011 09:55:35 +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 p5Q9tZUD012690
	for <perforce@FreeBSD.org>; Sun, 26 Jun 2011 09:55:35 GMT
	(envelope-from ilya@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p5Q9tZ62012687
	for perforce@freebsd.org; Sun, 26 Jun 2011 09:55:35 GMT
	(envelope-from ilya@FreeBSD.org)
Date: Sun, 26 Jun 2011 09:55:35 GMT
Message-Id: <201106260955.p5Q9tZ62012687@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 195357 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:55:35 -0000

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

Change 195357 by ilya@ilya_triton2011 on 2011/06/26 09:55:25

	Always allocate vnode with exclusive lock

Affected files ...

.. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#10 edit

Differences ...

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

@@ -99,9 +99,9 @@
             struct thread *td,
             uint64_t nodeid,
             enum vtype vtyp,
-	    int lkflags,
             struct vnode **vpp)
 {
+    const int lkflags = LK_EXCLUSIVE | LK_RETRY;
     struct fuse_vnode_data *fvdat;
     struct vnode *vp2;
     int err = 0;
@@ -124,8 +124,6 @@
         return (0);
     }
 
-    lkflags = LK_EXCLUSIVE | LK_RETRY; /* XXXIP don't loose other flags */
-
     fvdat = malloc(sizeof(*fvdat), M_FUSEVN, M_WAITOK | M_ZERO);
     err = getnewvnode("fuse", mp, &fuse_vnops, vpp);
     if (err) {
@@ -135,8 +133,11 @@
 
     vn_lock(*vpp, lkflags);
     err = insmntque(*vpp, mp);
+    ASSERT_VOP_ELOCKED(*vpp, "fuse_vnode_alloc");
     if (err) {
+        VOP_UNLOCK(*vpp, 0);
         free(fvdat, M_FUSEVN);
+        *vpp = NULL;
         return (err);
     }
 
@@ -145,6 +146,7 @@
         td, &vp2, fuse_vnode_cmp, &nodeid);
 
     if (err) {
+        VOP_UNLOCK(*vpp, 0);
         fuse_vnode_destroy(*vpp);
 	*vpp = NULL;
         return (err);
@@ -156,6 +158,7 @@
      */
     KASSERT(vp2 == NULL,
         ("vfs hash collision for node #%ju\n", (uintmax_t)nodeid));
+    ASSERT_VOP_ELOCKED(*vpp, "fuse_vnode_alloc");
 
     return (0);
 }
@@ -174,7 +177,7 @@
 
     debug_printf("dvp=%p\n", dvp);
 
-    err = fuse_vnode_alloc(mp, td, nodeid, vtyp, LK_EXCLUSIVE | LK_RETRY, vpp);
+    err = fuse_vnode_alloc(mp, td, nodeid, vtyp, vpp);
     if (err) {
         return err;
     }