From owner-svn-src-projects@FreeBSD.ORG  Sun Jul 22 14:31:43 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2DFCB1065670;
	Sun, 22 Jul 2012 14:31:43 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1949B8FC0A;
	Sun, 22 Jul 2012 14:31:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MEVg33094263;
	Sun, 22 Jul 2012 14:31:42 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MEVgn3094260;
	Sun, 22 Jul 2012 14:31:42 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201207221431.q6MEVgn3094260@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sun, 22 Jul 2012 14:31:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238688 - projects/fuse/sys/fs/fuse
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 14:31:43 -0000

Author: attilio
Date: Sun Jul 22 14:31:42 2012
New Revision: 238688
URL: http://svn.freebsd.org/changeset/base/238688

Log:
  Handle the case where there are collision in the inode vfs hash struct.
  
  Reported by:	pho
  Tested by:	pho

Modified:
  projects/fuse/sys/fs/fuse/fuse_node.c

Modified: projects/fuse/sys/fs/fuse/fuse_node.c
==============================================================================
--- projects/fuse/sys/fs/fuse/fuse_node.c	Sun Jul 22 13:41:45 2012	(r238687)
+++ projects/fuse/sys/fs/fuse/fuse_node.c	Sun Jul 22 14:31:42 2012	(r238688)
@@ -213,18 +213,13 @@ fuse_vnode_alloc(struct mount *mp,
 	}
 	err = vfs_hash_insert(*vpp, fuse_vnode_hash(nodeid), LK_EXCLUSIVE,
 	    td, &vp2, fuse_vnode_cmp, &nodeid);
-
-	if (err) {
-		fuse_vnode_destroy(*vpp);
-		*vpp = NULL;
+	if (err)
 		return (err);
+	if (vp2 != NULL) {
+		*vpp = vp2;
+		return (0);
 	}
-	/*
-         * XXXIP: Prevent silent vnode reuse. It may happen because several fuse
-         * filesystems ignore inode numbers
-         */
-	KASSERT(vp2 == NULL,
-	    ("vfs hash collision for node #%ju\n", (uintmax_t)nodeid));
+
 	ASSERT_VOP_ELOCKED(*vpp, "fuse_vnode_alloc");
 
 	return (0);