From owner-p4-projects@FreeBSD.ORG  Thu Jun 12 01:01:43 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 81BE71065676; Thu, 12 Jun 2008 01:01:43 +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 441B91065674
	for <perforce@freebsd.org>; Thu, 12 Jun 2008 01:01:43 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2DAF98FC1C
	for <perforce@freebsd.org>; Thu, 12 Jun 2008 01:01:42 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5C11glm031029
	for <perforce@freebsd.org>; Thu, 12 Jun 2008 01:01:42 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5C11gua031027
	for perforce@freebsd.org; Thu, 12 Jun 2008 01:01:42 GMT
	(envelope-from julian@freebsd.org)
Date: Thu, 12 Jun 2008 01:01:42 GMT
Message-Id: <200806120101.m5C11gua031027@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 143336 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Thu, 12 Jun 2008 01:01:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=143336

Change 143336 by julian@julian_trafmon1 on 2008/06/12 01:01:13

	Somehow not in last integ..

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate

Differences ...

==== //depot/projects/vimage-commit2/src/sys/fs/ntfs/ntfs_ihash.c#2 (text+ko) ====

@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.23 2007/11/13 19:34:06 maxim Exp $
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.24 2008/06/11 18:55:19 ed Exp $
  */
 
 #include <sys/param.h>
@@ -52,7 +52,7 @@
  */
 static LIST_HEAD(nthashhead, ntnode) *ntfs_nthashtbl;
 static u_long	ntfs_nthash;		/* size of hash table - 1 */
-#define	NTNOHASH(device, inum)	(&ntfs_nthashtbl[(minor(device) + (inum)) & ntfs_nthash])
+#define	NTNOHASH(inum)	(&ntfs_nthashtbl[(inum) & ntfs_nthash])
 static struct mtx ntfs_nthash_mtx;
 struct lock ntfs_hashlock;
 
@@ -90,7 +90,7 @@
 	struct ntnode *ip;
 
 	mtx_lock(&ntfs_nthash_mtx);
-	LIST_FOREACH(ip, NTNOHASH(dev, inum), i_hash)
+	LIST_FOREACH(ip, NTNOHASH(inum), i_hash)
 		if (inum == ip->i_number && dev == ip->i_dev)
 			break;
 	mtx_unlock(&ntfs_nthash_mtx);
@@ -108,7 +108,7 @@
 	struct nthashhead *ipp;
 
 	mtx_lock(&ntfs_nthash_mtx);
-	ipp = NTNOHASH(ip->i_dev, ip->i_number);
+	ipp = NTNOHASH(ip->i_number);
 	LIST_INSERT_HEAD(ipp, ip, i_hash);
 	ip->i_flag |= IN_HASHED;
 	mtx_unlock(&ntfs_nthash_mtx);